Skip to content

Commit 5192bb3

Browse files
committed
Merge branch 'refactor-host' of github.com:roc-lang/basic-cli into decode
2 parents d8f6860 + dfeb68a commit 5192bb3

File tree

30 files changed

+653
-258
lines changed

30 files changed

+653
-258
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
on:
1+
on:
22
pull_request:
33
workflow_dispatch:
44

@@ -8,7 +8,6 @@ concurrency:
88
cancel-in-progress: true
99

1010
jobs:
11-
1211
build-and-test-native:
1312
runs-on: ${{ matrix.operating-system }}
1413
strategy:
@@ -19,12 +18,12 @@ jobs:
1918

2019
- name: Does init() in platform/src/lib.rs contain all roc_fx functions? (Imperfect check)
2120
run: cat platform/src/lib.rs | grep -oP 'roc_fx_[^(\s]*' | sort | uniq -u | grep -q . && exit 1 || exit 0
22-
21+
2322
- id: try_fetching_testing_release
2423
continue-on-error: true
2524
run: |
2625
curl -fOL https://github.com/roc-lang/roc/releases/download/nightly/roc_nightly-linux_x86_64-TESTING.tar.gz
27-
26+
2827
- name: There are no TESTING releases, checking regular releases instead
2928
if: steps.try_fetching_testing_release.outcome == 'failure'
3029
run: |
@@ -58,6 +57,3 @@ jobs:
5857
# Workaround for https://github.com/roc-lang/roc/issues/6688
5958
- name: Check if crash occurred
6059
run: grep -zqv "crashed" all_tests_output.log
61-
62-
# TODO clippy, rustfmt, roc fmt check
63-

.github/workflows/ci_nix.yml

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
1-
on:
2-
pull_request:
3-
workflow_dispatch:
1+
on:
2+
pull_request:
3+
workflow_dispatch:
44

55
# this cancels workflows currently in progress if you start a new one
66
concurrency:
7-
group: ${{ github.workflow }}-${{ github.ref }}
8-
cancel-in-progress: true
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: true
99

1010
jobs:
11-
build-and-test-nix:
12-
strategy:
13-
fail-fast: false
14-
matrix:
15-
# macos-12 uses x86-64 machine, macos-14 uses aarch64
16-
os: [ macos-12, macos-14, ubuntu-22.04 ]
17-
runs-on: ${{ matrix.os }}
18-
steps:
19-
- uses: actions/checkout@v3
20-
21-
# install nix
22-
- uses: cachix/install-nix-action@v23
23-
with:
24-
nix_path: nixpkgs=channel:nixos-unstable
25-
26-
- uses: cachix/cachix-action@v12
27-
with:
28-
name: enigmaticsunrise
29-
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
30-
31-
- name: print architecture
32-
run: uname -m
33-
34-
- name: Run all tests
35-
run: nix develop -c sh -c 'export ROC=roc && export EXAMPLES_DIR=./examples/ && ./ci/all_tests.sh'
36-
37-
- name: Run all tests and capture output to check for crash later
38-
run: nix develop -c sh -c 'export ROC=roc && export EXAMPLES_DIR=./examples/ && ./ci/all_tests.sh 2>&1 | tee all_tests_output.log'
39-
40-
# Workaround for https://github.com/roc-lang/roc/issues/6688
41-
- name: Check if crash occurred
42-
run: grep -qv "crashed" all_tests_output.log
43-
44-
11+
build-and-test-nix:
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
# macos-12 uses x86-64 machine, macos-14 uses aarch64
16+
os: [macos-12, macos-14, ubuntu-22.04]
17+
runs-on: ${{ matrix.os }}
18+
steps:
19+
- uses: actions/checkout@v3
20+
21+
# install nix
22+
- uses: cachix/install-nix-action@v23
23+
with:
24+
nix_path: nixpkgs=channel:nixos-unstable
25+
26+
- uses: cachix/cachix-action@v12
27+
with:
28+
name: enigmaticsunrise
29+
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
30+
31+
- name: print architecture
32+
run: uname -m
33+
34+
- name: Run all tests
35+
run: nix develop -c sh -c 'export ROC=roc && export EXAMPLES_DIR=./examples/ && ./ci/all_tests.sh'
36+
37+
- name: Run all tests and capture output to check for crash later
38+
run: nix develop -c sh -c 'export ROC=roc && export EXAMPLES_DIR=./examples/ && ./ci/all_tests.sh 2>&1 | tee all_tests_output.log'
39+
40+
# Workaround for https://github.com/roc-lang/roc/issues/6688
41+
- name: Check if crash occurred
42+
run: grep -qv "crashed" all_tests_output.log

.github/workflows/test_latest_release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ concurrency:
77
cancel-in-progress: true
88

99
jobs:
10-
1110
test-latest-release:
1211
runs-on: [ubuntu-20.04]
1312
steps:
@@ -26,6 +25,6 @@ jobs:
2625

2726
- name: Use ./ci/test_latest_release.sh of the latest git main
2827
run: mv -f ./temp/test_latest_release.sh ./ci/
29-
28+
3029
- name: Run all tests with latest roc release + latest basic-cli release
3130
run: EXAMPLES_DIR=./examples/ ./ci/test_latest_release.sh

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,9 @@ all_tests_output.log
6868
platform/*.a
6969

7070
ci/file-testBROKEN
71+
72+
# glue generated files
73+
crates/roc_std
74+
75+
# build script artifacts
76+
build

20240704-basic-cli-build-steps.png

222 KB
Loading

0 commit comments

Comments
 (0)