Skip to content
This repository has been archived by the owner on Jun 10, 2024. It is now read-only.

Commit

Permalink
chore: handle rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@bitwalker
bitwalker committed Aug 26, 2022
1 parent cf96c1e commit b896336
Show file tree
Hide file tree
Showing 339 changed files with 2,232 additions and 5,387 deletions.
4 changes: 2 additions & 2 deletions .envrc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export LLVM_PREFIX=${XDG_DATA_HOME}/llvm/lumen
export LUMEN_BUILD_TYPE=static
export LLVM_PREFIX=${XDG_DATA_HOME}/llvm/firefly
export FIREFLY_BUILD_TYPE=static
export LLVM_LINK_LLVM_DYLIB=ON
2 changes: 1 addition & 1 deletion .github/workflows/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM rust:latest

RUN cd /tmp \
&& wget -q https://github.com/lumen/llvm-project/releases/download/lumen-12.0.0-dev_2020-10-22/clang+llvm-12.0.0-x86_64-linux-gnu.tar.gz \
&& wget -q https://github.com/lumen/llvm-project/releases/download/firefly-12.0.0-dev_2020-10-22/clang+llvm-12.0.0-x86_64-linux-gnu.tar.gz \
&& tar -xzf clang+llvm-12.0.0-x86_64-linux-gnu.tar.gz \
&& rm -f clang+llvm-12.0.0-x86_64-linux-gnu.tar.gz \
&& mv clang+llvm-12.0.0-x86_64-linux-gnu /opt/llvm \
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/wasm32-unknown-unknown-linux.yml
View file

This file was deleted.

59 changes: 0 additions & 59 deletions .github/workflows/wasm32-unknown-unknown-macOS.yml
View file

This file was deleted.

20 changes: 10 additions & 10 deletions .github/workflows/x86_64-apple-darwin-compiler.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: push

env:
EPOCH: 0
LUMEN_BUILD_TYPE: static
FIREFLY_BUILD_TYPE: static
LLVM_LINK_LLVM_DYLIB: ON
TOOLCHAIN: nightly-2022-07-12

Expand Down Expand Up @@ -35,26 +35,26 @@ jobs:
id: cache-llvm
uses: actions/cache@v2
with:
path: ~/.local/share/llvm/lumen
key: lumen-15.0.0-dev_2022-07-22-apple-darwin21.5.0
path: ~/.local/share/llvm/firefly
key: firefly-15.0.0-dev_2022-07-22-apple-darwin21.5.0
- name: Install LLVM
if: steps.cache-llvm.outputs.cache-hit != 'true'
run: |
mkdir -p ~/.local/share/llvm
pushd ~/.local/share/llvm
wget https://github.com/lumen/llvm-project/releases/download/lumen-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
wget https://github.com/lumen/llvm-project/releases/download/firefly-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
tar xvfz clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 lumen
mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 firefly
popd
- name: Set LLVM_PREFIX
run: echo "LLVM_PREFIX=$HOME/.local/share/llvm/lumen" >> $GITHUB_ENV
run: echo "LLVM_PREFIX=$HOME/.local/share/llvm/firefly" >> $GITHUB_ENV
- name: Install Ninja
run: brew install ninja
- name: Build Compiler
uses: actions-rs/cargo@v1
with:
command: make
args: lumen
args: firefly
- name: Add Compiler To Path
run: |
if [ -n "${GITHUB_PATH}" ]; then
Expand All @@ -66,13 +66,13 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: make
args: test --package lumen
- name: Run liblumen_otp integration tests
args: test-lit
- name: Run firefly_otp integration tests
uses: actions-rs/cargo@v1
with:
command: make
args: |
test --package liblumen_otp lib:: -- --skip lumen::otp
test --package firefly_otp lib:: -- --skip firefly::otp
- name: Run spawn-chain tests
uses: actions-rs/cargo@v1
with:
Expand Down
31 changes: 16 additions & 15 deletions ...rkflows/x86_64-apple-darwin-lumen-otp.yml → ...flows/x86_64-apple-darwin-firefly-otp.yml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: x86_64-apple-darwin lumen/otp
name: x86_64-apple-darwin firefly/otp

on: push

env:
TOOLCHAIN: nightly-2022-07-12

jobs:
lumen-otp:
firefly-otp:
if: ${{ false }} # disable
runs-on: macos-12

steps:
Expand All @@ -32,48 +33,48 @@ jobs:
id: cache-llvm
uses: actions/cache@v2
with:
path: ~/.local/share/llvm/lumen
key: lumen-15.0.0-dev_2022-07-22-apple-darwin21.5.0
path: ~/.local/share/llvm/firefly
key: firefly-15.0.0-dev_2022-07-22-apple-darwin21.5.0
- name: Install LLVM
if: steps.cache-llvm.outputs.cache-hit != 'true'
run: |
mkdir -p ~/.local/share/llvm
pushd ~/.local/share/llvm
wget https://github.com/lumen/llvm-project/releases/download/lumen-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
wget https://github.com/lumen/llvm-project/releases/download/firefly-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
tar xvfz clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 lumen
mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 firefly
popd
- name: Set LLVM_PREFIX
run: echo "LLVM_PREFIX=$HOME/.local/share/llvm/lumen" >> $GITHUB_ENV
run: echo "LLVM_PREFIX=$HOME/.local/share/llvm/firefly" >> $GITHUB_ENV
- name: Install Ninja
run: brew install ninja
- name: Build Compiler
uses: actions-rs/cargo@v1
with:
command: make
args: lumen
- name: lumen/otp Checkout
args: firefly
- name: firefly/otp Checkout
run: |
cd ..
git init otp
cd otp
echo "ERL_TOP=$PWD" >> $GITHUB_ENV
git remote add origin https://github.com/lumen/otp
git fetch --no-tags --prune --progress --depth=1 origin +ca83f680aab717fe65634247d16f18a8cbfc6d8d:refs/remotes/origin/lumen
git checkout --progress --force -B lumen refs/remotes/origin/lumen
- name: lumen/otp autoconf
git fetch --no-tags --prune --progress --depth=1 origin +ca83f680aab717fe65634247d16f18a8cbfc6d8d:refs/remotes/origin/firefly
git checkout --progress --force -B firefly refs/remotes/origin/firefly
- name: firefly/otp autoconf
run: |
cd ../otp
./otp_build autoconf
- name: lumen/otp configure
- name: firefly/otp configure
run: |
cd ../otp
./configure
- name: Install Erlang
run: brew install erlang
- name: Test compiling lumen/otp against liblumen_otp
- name: Test compiling firefly/otp against firefly_otp
uses: actions-rs/cargo@v1
with:
command: make
args: |
test -- --package liblumen_otp lumen::otp::
test -- --package firefly_otp firefly::otp::
32 changes: 21 additions & 11 deletions .github/workflows/x86_64-apple-darwin-libraries.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,43 @@ jobs:
id: cache-llvm
uses: actions/cache@v2
with:
path: ~/.local/share/llvm/lumen
key: lumen-15.0.0-dev_2022-07-22-apple-darwin21.5.0
path: ~/.local/share/llvm/firefly
key: firefly-15.0.0-dev_2022-07-22-apple-darwin21.5.0
- name: Install LLVM
if: steps.cache-llvm.outputs.cache-hit != 'true'
run: |
mkdir -p ~/.local/share/llvm
pushd ~/.local/share/llvm
wget https://github.com/lumen/llvm-project/releases/download/lumen-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
wget https://github.com/lumen/llvm-project/releases/download/firefly-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
tar xvfz clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 lumen
mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 firefly
popd
- name: Set LLVM_PREFIX
run: echo "LLVM_PREFIX=$HOME/.local/share/llvm/lumen" >> $GITHUB_ENV
run: echo "LLVM_PREFIX=$HOME/.local/share/llvm/firefly" >> $GITHUB_ENV
- name: Install Ninja
run: brew install ninja
- name: Run liblumen_arena tests
- name: firefly_arena
uses: actions-rs/cargo@v1
with:
command: make
args: test -- --package liblumen_arena
- name: Test liblumen_core
args: test -- --package firefly_arena
- name: firefly_alloc
uses: actions-rs/cargo@v1
with:
command: make
args: test -- --package liblumen_core
- name: Test liblumen_alloc
args: test -- --package firefly_alloc
- name: firefly_binary
uses: actions-rs/cargo@v1
with:
command: make
args: test -- --package liblumen_alloc
args: test -- --package firefly_binary
- name: firefly_system
uses: actions-rs/cargo@v1
with:
command: make
args: test -- --package firefly_system
- name: firefly_rt
uses: actions-rs/cargo@v1
with:
command: make
args: test -- --package firefly_rt
21 changes: 11 additions & 10 deletions .github/workflows/x86_64-apple-darwin-runtime_full.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ env:

jobs:
runtime:
if: ${{ false }} # disable
runs-on: macos-12

steps:
Expand All @@ -32,35 +33,35 @@ jobs:
id: cache-llvm
uses: actions/cache@v2
with:
path: ~/.local/share/llvm/lumen
key: lumen-15.0.0-dev_2022-07-22-apple-darwin21.5.0
path: ~/.local/share/llvm/firefly
key: firefly-15.0.0-dev_2022-07-22-apple-darwin21.5.0
- name: Install LLVM
if: steps.cache-llvm.outputs.cache-hit != 'true'
run: |
mkdir -p ~/.local/share/llvm
pushd ~/.local/share/llvm
wget https://github.com/lumen/llvm-project/releases/download/lumen-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
wget https://github.com/lumen/llvm-project/releases/download/firefly-15.0.0-dev_2022-07-22/clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
tar xvfz clang+llvm-15.0.0-x86_64-apple-darwin21.5.0.tar.gz
mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 lumen
mv clang+llvm-15.0.0-x86_64-apple-darwin21.5.0 firefly
popd
- name: Set LLVM_PREFIX
run: echo "LLVM_PREFIX=$HOME/.local/share/llvm/lumen" >> $GITHUB_ENV
run: echo "LLVM_PREFIX=$HOME/.local/share/llvm/firefly" >> $GITHUB_ENV
- name: Install Ninja
run: brew install ninja
- name: Build Compiler
uses: actions-rs/cargo@v1
with:
command: make
args: lumen
- name: Run lumen_rt_full tests
args: firefly
- name: Run firefly_rt_full tests
uses: actions-rs/cargo@v1
with:
command: make
args: |
test -- --package lumen_rt_full
- name: Run liblumen_otp tests with runtime_full
test -- --package firefly_rt_full
- name: Run firefly_otp tests with runtime_full
uses: actions-rs/cargo@v1
with:
command: make
args: |
test -- --package liblumen_otp -- --skip lib:: --skip lumen::otp
test -- --package firefly_otp -- --skip lib:: --skip firefly::otp
9 changes: 5 additions & 4 deletions .github/workflows/x86_64-unknown-linux-gnu-compiler.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ env:

jobs:
compiler:
if: ${{ false }} # disable
runs-on: ubuntu-latest
container: kronicdeth/lumen-development@sha256:2809805464d685940b58765a634fa23a5fd1a62c65710cfa43a8791cd50fbecd

Expand All @@ -23,7 +24,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: make
args: lumen
args: firefly
- name: Add Compiler To Path
run: |
if [ -n "${GITHUB_PATH}" ]; then
Expand All @@ -35,13 +36,13 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: make
args: test -- --package lumen
- name: Run liblumen_otp integration tests
args: test-lit
- name: Run firefly_otp integration tests
uses: actions-rs/cargo@v1
with:
command: make
args: |
test -- --package liblumen_otp lib:: -- --skip lumen::otp
test -- --package firefly_otp lib:: -- --skip firefly::otp
- name: Run spawn-chain tests
uses: actions-rs/cargo@v1
with:
Expand Down
Loading

3 comments on commit b896336

@lpil
Copy link
Contributor

@lpil lpil commented on b896336 Aug 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really exciting to see all this progress being made!

I like the new name. Is there a particular reason for the change?

@bitwalker
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lpil A big reason is that over the past year or two we've come across numerous other "Lumen" projects/products, to the point where it started to feel a bit ridiculous. Lumen was picked by me on a whim as a name back when the project started, but it was really meant to be a placeholder, and it just kinda became the formal name of the project since we couldn't come up with anything we liked better at the time. We figured it was best to rename now, before we make any effort to re-stoke interest in the project, and pick something we liked better. I was watching fireflies in my yard this summer, and that was basically the inspiration for the new name, and at the same time I was finishing a rewrite of the entire compiler and core parts of the runtime started earlier this year when I came back to DockYard, so in many ways its not the same project that it was 2 years ago, and a rename feels appropriate for that reason as well.

Anyway, that's probably more detail than you really care about, but now you know the gritty details :)

@lpil
Copy link
Contributor

@lpil lpil commented on b896336 Aug 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love the detail. Thanks!

Please sign in to comment.