GitHub CI: Use the new download-bsc action

B-Lang-org · Jan 16, 2024 · 5f0fcb0 · 5f0fcb0
1 parent 00aee5a
commit 5f0fcb0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 85 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,14 +15,14 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Download bsc
-        shell: bash
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ".github/workflows/get_latest_bsc.sh ${{ matrix.os }} "
+        uses: B-Lang-org/download-bsc@v1
+        with:
+          os: ${{ matrix.os }}
+          path: ../
 
       - name: Build
         run: |
-          export PATH=$PWD/../bsc/inst/bin:$PATH
+          export PATH=$PWD/../bsc/bin:$PATH
           make install
           tar czf inst.tar.gz inst
 
@@ -40,15 +40,16 @@ jobs:
     runs-on: ${{ matrix. os }}
     steps:
       - uses: actions/checkout@v3
+
       - name: Download bsc
-        shell: bash
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ".github/workflows/get_latest_bsc.sh ${{ matrix.os }} "
+        uses: B-Lang-org/download-bsc@v1
+        with:
+          os: ${{ matrix.os }}
+          path: ../
 
       - name: Build
         run: |
-          export PATH=$PWD/../bsc/inst/bin:$PATH
+          export PATH=$PWD/../bsc/bin:$PATH
           make install
           tar czf inst.tar.gz inst
 
@@ -66,6 +67,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
+
       - name: Install dependencies
         shell: bash
         run: "sudo .github/workflows/install_dependencies_doc_ubuntu.sh"
@@ -87,6 +89,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
+
       - name: Install dependencies
         shell: bash
         run: ".github/workflows/install_dependencies_doc_macos.sh"
@@ -120,15 +123,18 @@ jobs:
 
       # Can this be cached from the previous job?
       - name: Download bsc
-        shell: bash
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ".github/workflows/get_latest_bsc.sh ${{ matrix.os }} "
+        id: download
+        uses: B-Lang-org/download-bsc@v1
+        with:
+          os: ${{ matrix.os }}
+          path: ../
 
-      # This ought to be downloaded at the same version as BSC?
+      # Checkout the testsuite at the same version
       - name: Download testsuite
         run: |
-          git clone https://github.com/B-Lang-org/bsc ../bsc-testsuite
+          git clone -n https://github.com/B-Lang-org/bsc ../bsc-testsuite
+          cd ../bsc-testsuite
+          git checkout ${{ steps.download.outputs.commit }}
       - name: Add bdw tests to testsuite
         run: |
           cp -r testing/bsc.bdw ../bsc-testsuite/testsuite/
@@ -174,7 +180,7 @@ jobs:
 
           cd ../bsc-testsuite/testsuite
 
-          export TEST_RELEASE=$PWD/../../bsc/inst
+          export TEST_RELEASE=$PWD/../../bsc
           export TEST_CONTRIB=
 
           export BDW=$PWD/../../bdw/inst/bin/bdw
@@ -217,15 +223,18 @@ jobs:
 
       # Can this be cached from the previous job?
       - name: Download bsc
-        shell: bash
-        env:
-          TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ".github/workflows/get_latest_bsc.sh ${{ matrix.os }} "
+        id: download
+        uses: B-Lang-org/download-bsc@v1
+        with:
+          os: ${{ matrix.os }}
+          path: ../
 
-      # This ought to be downloaded at the same version as BSC?
+      # Checkout the testsuite at the same version
       - name: Download testsuite
         run: |
-          git clone https://github.com/B-Lang-org/bsc ../bsc-testsuite
+          git clone -n https://github.com/B-Lang-org/bsc ../bsc-testsuite
+          cd ../bsc-testsuite
+          git checkout ${{ steps.download.outputs.commit }}
       - name: Add bdw tests to testsuite
         run: |
           cp -r testing/bsc.bdw ../bsc-testsuite/testsuite/
@@ -261,12 +270,12 @@ jobs:
           trap ./archive_logs.sh EXIT
 
           # Use -O0 for significantly faster C++ compiles (which more
-          # than make up for slower simulations).
+          # than make up for slower simulations)
           export CXXFLAGS="-O0"
 
           cd ../bsc-testsuite/testsuite
 
-          export TEST_RELEASE=$PWD/../../bsc/inst
+          export TEST_RELEASE=$PWD/../../bsc
           export TEST_CONTRIB=
 
           export BDW=$PWD/../../bdw/inst/bin/bdw

diff --git a/.github/workflows/get_latest_bsc.sh b/.github/workflows/get_latest_bsc.sh