fix: Bump Ubuntu 22.10 to 23.04

Sync build scripts to match 9.4.x

Signed-off-by: Gordon Smith <[email protected]>

.github/workflows/prebuild-docker.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         image:
           [
-            "ubuntu-22.10",
+            "ubuntu-23.04",
             "ubuntu-22.04",
             "ubuntu-20.04",
             "centos-8",
@@ -34,6 +34,10 @@ jobs:
     name: "Docker:  ${{ matrix.image }}"
     runs-on: ubuntu-latest
     steps:
+      - name: Free additional disk space (remove Android SDK + Tools)
+        run: |
+          sudo rm -rf /usr/local/lib/android
+
       - name: Check out source code
         uses: actions/checkout@v3
         with:
@@ -79,4 +83,6 @@ jobs:
           tags: |
             hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }}
             hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }}
-  
+          cache-from: |
+            type=registry,ref=hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }}
+            type=registry,ref=hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }}

.github/workflows/prebuild-gh_envs.yml

@@ -122,6 +122,15 @@ jobs:
         run: |
           brew install pkg-config automake libtool autoconf autoconf-archive
 
+      - name: "Only run on windows"
+        if: ${{ startsWith(matrix.os, 'windows') }}
+        working-directory: ..
+        shell: pwsh
+        run: |
+          Remove-Item -Path "${{ github.workspace }}" -Recurse -Force
+          New-Item -ItemType Directory -Path "C:\workspace"
+          New-Item -ItemType SymbolicLink -Path "${{ github.workspace }}" -Target "C:\workspace"
+  
       - name: "Remove builtin vcpkg (old)"
         working-directory: .
         shell: "bash"

dockerfiles/build.sh

@@ -8,7 +8,7 @@ export $(grep -v '^#' $SCRIPT_DIR/../.env | xargs -d '\r' | xargs -d '\n') > /de
 GITHUB_ACTOR="${GITHUB_ACTOR:-hpcc-systems}"
 GITHUB_TOKEN="${GITHUB_TOKEN:-none}"
 GITHUB_REF=$(git rev-parse --short=8 HEAD)
-GITHUB_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+GITHUB_BRANCH=$(git branch --show-current)
 DOCKER_USERNAME="${DOCKER_USERNAME:-hpccbuilds}"
 DOCKER_PASSWORD="${DOCKER_PASSWORD:-none}"
 
@@ -20,25 +20,27 @@ echo "GITHUB_BRANCH: $GITHUB_BRANCH"
 echo "DOCKER_USERNAME: $DOCKER_USERNAME"
 echo "DOCKER_PASSWORD: $DOCKER_PASSWORD"
 
-# docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
 
 function doBuild() {
-    docker build --progress plain -f "$SCRIPT_DIR/$1.dockerfile" \
+    docker build --progress plain --rm -f "$SCRIPT_DIR/$1.dockerfile" \
+        --build-arg NUGET_MODE=readwrite \
         --build-arg GITHUB_ACTOR=$GITHUB_ACTOR \
         --build-arg GITHUB_TOKEN=$GITHUB_TOKEN \
         -t hpccsystems/platform-build-base-$1:$GITHUB_REF \
         -t hpccsystems/platform-build-base-$1:$GITHUB_BRANCH \
+        --cache-from hpccsystems/platform-build-base-$1:$GITHUB_REF \
+        --cache-from hpccsystems/platform-build-base-$1:$GITHUB_BRANCH \
         "$SCRIPT_DIR/.."
-
-    # docker push hpccsystems/platform-build-base-$1:$GITHUB_REF
-    # docker push hpccsystems/platform-build-base-$1:latest
+    docker push hpccsystems/platform-build-base-$1:$GITHUB_REF
+    docker push hpccsystems/platform-build-base-$1:$GITHUB_BRANCH
 }
 
 doBuild centos-7 &
 doBuild centos-8 &
-doBuild amazonlinux &
-doBuild ubuntu-22.10 &
+doBuild ubuntu-23.04 &
 doBuild ubuntu-22.04 &
 doBuild ubuntu-20.04 &
+doBuild amazonlinux &
 
 wait

dockerfiles/ubuntu-22.10.dockerfile → dockerfiles/ubuntu-23.04.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.10 AS base_build
+FROM ubuntu:23.04 AS base_build
 
 ENV DEBIAN_FRONTEND=noninteractive