Skip to content

Commit

Permalink
Updated GHA to support the latest Odin version
Browse files Browse the repository at this point in the history
  • Loading branch information
gvrooyen committed Sep 2, 2024
1 parent ded8678 commit e35516d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
18 changes: 12 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,26 @@ jobs:
runs-on: ubuntu-22.04

steps:
- name: Update packages
run: sudo apt update
- name: Download Clang
run: wget https://apt.llvm.org/llvm.sh

- name: Install Clang
run: sudo apt -y install clang
- name: Set install script permissions
run: chmod u+x llvm.sh

- name: Install Clang 18
run: sudo ./llvm.sh 18

- name: Setup default version
run: sudo ln /usr/bin/clang-18 /usr/bin/clang

- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332

- name: Setup Odin
uses: laytan/setup-odin@41f9612bfec760bbb68b05b5747f319afe7c48d8
uses: laytan/setup-odin@3df60bd622575fda7efa4a3ec928f446bcae1a0a
with:
token: ${{ secrets.GITHUB_TOKEN }}
llvm-version: 14
llvm-version: 18

- name: Verify all exercises
run: bin/verify-exercises
2 changes: 1 addition & 1 deletion bin/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function run_test() {
# double-check that the example didn't accidentally get duplicated as the stub, this isn't
# too critical for now.

if odin test ${tmp_path} ; then
if odin test ${tmp_path} 2> /dev/null ; then
echo -e '\nERROR: The stub solution must not pass the tests!\n'
exit 1
else
Expand Down
2 changes: 1 addition & 1 deletion exercises/practice/grains/grains.odin
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package grains

Error :: enum {}// Please inspect the tests to see which error states to enumerate here.
Error :: enum {} // Please inspect the tests to see which error states to enumerate here.


// Returns the number of grains on the specified square.
Expand Down
2 changes: 1 addition & 1 deletion exercises/practice/resistor-color/resistor_color.odin
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package resistor_color

Color :: enum {}// Implement an enumeration of all the resistor colors.
Color :: enum {} // Implement an enumeration of all the resistor colors.


code :: proc(color: Color) -> int {
Expand Down

0 comments on commit e35516d

Please sign in to comment.