Skip to content

Commit

Permalink
Merge pull request #7215 from roc-lang/fix-nightlies
Browse files Browse the repository at this point in the history
fix hello world issues
  • Loading branch information
Anton-4 authored Nov 13, 2024
2 parents fe6790e + 8479b01 commit e60c895
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 20 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: docker compose -f docker/nightly-ubuntu-latest/docker-compose.yml build

- name: Run hello world test
run: docker compose -f docker/nightly-ubuntu-latest/docker-compose.yml run roc examples/helloWorld.roc
run: docker compose -f docker/nightly-ubuntu-latest/docker-compose.yml run roc examples/platform-switching/rocLovesZig.roc


nightly-ubuntu-2204:
Expand All @@ -37,7 +37,7 @@ jobs:
run: docker compose -f docker/nightly-ubuntu-2204/docker-compose.yml build

- name: Run hello world test
run: docker compose -f docker/nightly-ubuntu-2204/docker-compose.yml run roc examples/helloWorld.roc
run: docker compose -f docker/nightly-ubuntu-2204/docker-compose.yml run roc examples/platform-switching/rocLovesZig.roc

nightly-ubuntu-2004:
name: nightly-ubuntu-2004
Expand All @@ -53,7 +53,7 @@ jobs:
run: docker compose -f docker/nightly-ubuntu-2004/docker-compose.yml build

- name: Run hello world test
run: docker compose -f docker/nightly-ubuntu-2004/docker-compose.yml run roc examples/helloWorld.roc
run: docker compose -f docker/nightly-ubuntu-2004/docker-compose.yml run roc examples/platform-switching/rocLovesZig.roc

nightly-debian-latest:
name: nightly-debian-latest
Expand All @@ -69,7 +69,7 @@ jobs:
run: docker compose -f docker/nightly-debian-latest/docker-compose.yml build

- name: Run hello world test
run: docker compose -f docker/nightly-debian-latest/docker-compose.yml run roc examples/helloWorld.roc
run: docker compose -f docker/nightly-debian-latest/docker-compose.yml run roc examples/platform-switching/rocLovesZig.roc

nightly-debian-bookworm:
name: nightly-debian-bookworm
Expand All @@ -85,7 +85,7 @@ jobs:
run: docker compose -f docker/nightly-debian-bookworm/docker-compose.yml build

- name: Run hello world test
run: docker compose -f docker/nightly-debian-bookworm/docker-compose.yml run roc examples/helloWorld.roc
run: docker compose -f docker/nightly-debian-bookworm/docker-compose.yml run roc examples/platform-switching/rocLovesZig.roc

nightly-debian-buster:
name: nightly-debian-buster
Expand All @@ -101,4 +101,4 @@ jobs:
run: docker compose -f docker/nightly-debian-buster/docker-compose.yml build

- name: Run hello world test
run: docker compose -f docker/nightly-debian-buster/docker-compose.yml run roc examples/helloWorld.roc
run: docker compose -f docker/nightly-debian-buster/docker-compose.yml run roc examples/platform-switching/rocLovesZig.roc
2 changes: 1 addition & 1 deletion .github/workflows/nightly_macos_apple_silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

- name: test with zig platform
run: |
cd ${{ env.RELEASE_FOLDER_NAME }} && ./roc --build-host --suppress-build-host-warning crates/cli/tests/test-projects/test-platform-simple-zig/app.roc
cd ${{ env.RELEASE_FOLDER_NAME }} && ./roc --build-host --suppress-build-host-warning examples/platform-switching/rocLovesZig.roc
- name: print short commit SHA
run: git rev-parse --short "$GITHUB_SHA"
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/test_nightly_macos_apple_silicon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,11 @@ jobs:
- name: rename nightly folder
run: mv roc_nightly* roc_nightly

- name: test roc hello world
run: cd roc_nightly && ./roc examples/helloWorld.roc

- name: test platform switching zig
run: cd roc_nightly && ./roc examples/platform-switching/rocLovesZig.roc
run: cd roc_nightly && ./roc examples/platform-switching/rocLovesZig.roc --build-host --suppress-build-host-warning

- name: test platform switching c
run: cd roc_nightly && ./roc examples/platform-switching/rocLovesC.roc
run: cd roc_nightly && ./roc examples/platform-switching/rocLovesC.roc --build-host --suppress-build-host-warning

- name: test repl
run: |
Expand Down
3 changes: 0 additions & 3 deletions ci/basic_nightly_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ mv roc_nightly* roc_nightly

cd roc_nightly

# test roc hello world
./roc examples/helloWorld.roc

# test rust platform (first prebuild the host)
examples/platform-switching/rust-platform/build.sh
./roc examples/platform-switching/rocLovesRust.roc
Expand Down
2 changes: 1 addition & 1 deletion ci/package_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mkdir -p $1 $1/examples $1/crates/compiler/builtins/bitcode
mv target/release-with-lto/{roc,roc_language_server,lib} $1
mv LICENSE LEGAL_DETAILS $1

mv examples/{helloWorld.roc,platform-switching,cli} $1/examples
mv examples/{platform-switching,cli} $1/examples

mv crates/roc_std $1/crates
mv crates/compiler/builtins/bitcode/src $1/crates/compiler/builtins/bitcode
Expand Down
7 changes: 3 additions & 4 deletions www/content/install/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,14 @@ If you have a specific question, the [FAQ](/faq) might have an answer, although

## Running Examples

You can run examples as follows:
You can run [examples](https://github.com/roc-lang/examples) as follows:

```sh
git clone https://github.com/roc-lang/examples.git
cd examples
roc dev helloWorld.roc
roc ./HelloWorld/main.roc
```

[crates/cli/tests/benchmarks](https://github.com/roc-lang/roc/tree/main/crates/cli/tests/benchmarks) contains more examples.

## Getting Involved

The number of people involved in Roc's development has been steadily increasing
Expand Down

0 comments on commit e60c895

Please sign in to comment.