Merge branch 'master' into html5-css

gerph · Mar 22, 2022 · b143107 · b143107
2 parents 5159e9c + 3875985
commit b143107
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -92,21 +92,22 @@ jobs:
   export-posix:
     runs-on: ubuntu-20.04
     needs: ["test-riscos", "test-platforms"]
-    container: ubuntu:18.04
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Prerequisites
         run: |
-          apt-get update && apt-get install -y git make
+          sudo apt-get update && sudo apt-get install -y git make
 
       - name: Build release
         run: |
           set -e
+          eval "$(crosscompile/ci-vars)"
           cd crosscompile
           make cross_install ROTOOL_DIR=../artifacts
+          ../artifacts/riscos-prminxml --version
 
       - uses: actions/upload-artifact@v2
         with:
@@ -146,6 +147,7 @@ jobs:
       - name: Build through build.riscos.online
         run: |
           mkdir -p artifacts
+          eval "$(crosscompile/ci-vars)"
           crosscompile/build-riscos-archive.sh ${{ steps.version.outputs.leafname }}
 
       - uses: actions/upload-artifact@v2

diff --git a/crosscompile/build-riscos-tool.sh b/crosscompile/build-riscos-tool.sh
@@ -15,6 +15,11 @@ if [[ "${install_dir}" = '' ]] ; then
     exit 1
 fi
 
+if [[ "$CI_BRANCH_VERSION" = '' ]] ; then
+    echo "ERROR: Cannot build the tool without the CI_BRANCH_VERSION variable (use ci-vars)" >&2
+    exit 1
+fi
+
 # Get the version we are building
 version=${CI_BRANCH_VERSION:-VERSION}