Skip to content

Commit

Permalink
Merge pull request #262 from roc-lang/remove-prebuilt-platform
Browse files Browse the repository at this point in the history
remove --prebuilt-platform
  • Loading branch information
Anton-4 authored Nov 13, 2024
2 parents 4048641 + bbdd807 commit a8cf5ea
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
rustup target add x86_64-unknown-linux-musl
- name: Test building with musl target
run: CARGO_BUILD_TARGET=x86_64-unknown-linux-musl ./roc_nightly/roc build.roc --prebuilt-platform -- --roc ./roc_nightly/roc
run: CARGO_BUILD_TARGET=x86_64-unknown-linux-musl ./roc_nightly/roc build.roc -- --roc ./roc_nightly/roc

- name: Test using musl build
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ roc build.roc
```
Then you can run like usual:
```sh
$ roc --prebuilt-platform examples/hello-world.roc
$ roc examples/hello-world.roc
Hello, World!
```
14 changes: 7 additions & 7 deletions ci/all_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if [ "$NO_BUILD" != "1" ]; then
#./jump-start.sh

# build the basic-cli platform
$ROC ./build.roc --prebuilt-platform -- --roc $ROC
$ROC ./build.roc -- --roc $ROC
fi

# roc check
Expand All @@ -44,9 +44,9 @@ for roc_file in $EXAMPLES_DIR*.roc; do
fi

if [ "$base_file" == "temp-dir.roc" ]; then
$ROC build --prebuilt-platform $roc_file $ROC_BUILD_FLAGS --linker=legacy
$ROC build $roc_file $ROC_BUILD_FLAGS --linker=legacy
else
$ROC build --prebuilt-platform $roc_file $ROC_BUILD_FLAGS
$ROC build $roc_file $ROC_BUILD_FLAGS
fi

done
Expand Down Expand Up @@ -93,12 +93,12 @@ for roc_file in $EXAMPLES_DIR*.roc; do
if [ "$base_file" == "path.roc" ]; then
absolute_roc=$(which $ROC | xargs realpath)
cd $EXAMPLES_DIR
$absolute_roc dev --prebuilt-platform $base_file $ROC_BUILD_FLAGS
$absolute_roc dev $base_file $ROC_BUILD_FLAGS
cd ..
elif [ "$base_file" == "temp-dir.roc" ]; then
$ROC dev --prebuilt-platform $roc_file $ROC_BUILD_FLAGS --linker=legacy
$ROC dev $roc_file $ROC_BUILD_FLAGS --linker=legacy
else
$ROC dev --prebuilt-platform $roc_file $ROC_BUILD_FLAGS
$ROC dev $roc_file $ROC_BUILD_FLAGS
fi
done

Expand All @@ -116,7 +116,7 @@ find . -type d -name "roc_nightly" -prune -o -type f -name "*.roc" -print | whil

# don't exit script if test_command fails
set +e
test_command=$($ROC test "$file" --prebuilt-platform)
test_command=$($ROC test "$file")
test_exit_code=$?
set -e

Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a8cf5ea

Please sign in to comment.