Reuse container prep workflow

Author: dlon

.github/workflows/android-app.yml

@@ -64,6 +64,12 @@ env:
   SCHEDULE_E2E_REPEAT: 10
 
 jobs:
+  prepare-container:
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/android-container-image.txt
+      override_container_image: ${{ inputs.override_container_image }}
+
   prepare:
     name: Prepare
     runs-on: ubuntu-latest
@@ -73,16 +79,6 @@ jobs:
         with:
           submodules: true
 
-      - name: Use custom container image if specified
-        if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
-          >> $GITHUB_ENV
-
-      - name: Use default container image and resolve digest
-        if: ${{ github.event.inputs.override_container_image == '' }}
-        run: |
-          echo "inner_container_image=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV
-
       # Preparing variables this way instead of using `env.*` due to:
       # https://github.com/orgs/community/discussions/26388
       - name: Prepare environment variables
@@ -94,16 +90,15 @@ jobs:
           env.DEFAULT_E2E_REPEAT }}" \
           >> $GITHUB_ENV
     outputs:
-      container_image: ${{ env.inner_container_image }}
       E2E_TEST_INFRA_FLAVOR: ${{ env.INNER_E2E_TEST_INFRA_FLAVOR }}
       E2E_TEST_REPEAT: ${{ env.INNER_E2E_TEST_REPEAT }}
 
   build-native:
     name: Build native # Used by wait for jobs.
-    needs: prepare
+    needs: prepare-container
     runs-on: ubuntu-latest
     container:
-      image: "${{ needs.prepare.outputs.container_image }}"
+      image: "${{ needs.prepare-container.outputs.container_image }}"
     strategy:
       matrix:
         include:
@@ -175,10 +170,10 @@ jobs:
 
   run-lint-and-tests:
     name: Run lint and test tasks
-    needs: [prepare]
+    needs: prepare-container
     runs-on: ubuntu-latest
     container:
-      image: ${{ needs.prepare.outputs.container_image }}
+      image: "${{ needs.prepare-container.outputs.container_image }}"
     strategy:
       fail-fast: false
       matrix:
@@ -218,10 +213,10 @@ jobs:
 
   build-app:
     name: Build app
-    needs: [prepare]
+    needs: [prepare-container, prepare]
     runs-on: ubuntu-latest
     container:
-      image: ${{ needs.prepare.outputs.container_image }}
+      image: "${{ needs.prepare-container.outputs.container_image }}"
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:
       # https://github.com/actions/runner/issues/863
@@ -314,10 +309,10 @@ jobs:
 
   build-instrumented-tests:
     name: Build instrumented test packages
-    needs: [prepare]
+    needs: prepare-container
     runs-on: ubuntu-latest
     container:
-      image: ${{ needs.prepare.outputs.container_image }}
+      image: "${{ needs.prepare-container.outputs.container_image }}"
     strategy:
       matrix:
         include:

.github/workflows/android-audit.yml

@@ -31,25 +31,10 @@ permissions: {}
 
 jobs:
   prepare:
-    name: Prepare
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Use custom container image if specified
-        if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
-          >> $GITHUB_ENV
-
-      - name: Use default container image and resolve digest
-        if: ${{ github.event.inputs.override_container_image == '' }}
-        run: echo "inner_container_image=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV
-
-    outputs:
-      container_image: ${{ env.inner_container_image }}
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/android-container-image.txt
+      override_container_image: ${{ inputs.override_container_image }}
 
   ensure-clean-lockfile:
     needs: prepare

.github/workflows/android-kotlin-format-check.yml

@@ -18,25 +18,10 @@ permissions: {}
 
 jobs:
   prepare:
-    name: Prepare
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Use custom container image if specified
-        if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
-          >> $GITHUB_ENV
-
-      - name: Use default container image and resolve digest
-        if: ${{ github.event.inputs.override_container_image == '' }}
-        run: echo "inner_container_image=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV
-
-    outputs:
-      container_image: ${{ env.inner_container_image }}
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/android-container-image.txt
+      override_container_image: ${{ inputs.override_container_image }}
 
   check-formatting:
     needs: prepare

.github/workflows/android-xml-format-check.yml

@@ -11,18 +11,10 @@ permissions: {}
 
 jobs:
   prepare:
-    name: Prepare
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Resolve container image
-        run: |
-          echo "inner_container_image=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV
-    outputs:
-      container_image: ${{ env.inner_container_image }}
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/android-container-image.txt
+      override_container_image: ${{ inputs.override_container_image }}
 
   check-formatting:
     name: Lint XML using tidy

.github/workflows/clippy.yml

@@ -12,23 +12,9 @@ permissions: {}
 
 jobs:
   prepare-android:
-    name: Prepare Android container
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Use custom container image if specified
-        if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image_android=${{ github.event.inputs.override_container_image }}"
-          >> $GITHUB_ENV
-
-      - name: Use default container image and resolve digest
-        if: ${{ github.event.inputs.override_container_image == '' }}
-        run: echo "inner_container_image_android=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV
-
-    outputs:
-      container_image_android: ${{ env.inner_container_image_android }}
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/android-container-image.txt
 
   clippy-check-desktop:
     name: Clippy linting, desktop

.github/workflows/daemon.yml

@@ -37,22 +37,10 @@ permissions: {}
 
 jobs:
   prepare-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Use custom container image if specified
-        if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
-          >> $GITHUB_ENV
-
-      - name: Use default container image and resolve digest
-        if: ${{ github.event.inputs.override_container_image == '' }}
-        run: echo "inner_container_image=$(cat ./building/linux-container-image.txt)" >> $GITHUB_ENV
-
-    outputs:
-      container_image: ${{ env.inner_container_image }}
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/linux-container-image.txt
+      override_container_image: ${{ inputs.override_container_image }}
 
   build-linux:
     needs: prepare-linux

.github/workflows/desktop-e2e.yml

@@ -91,20 +91,9 @@ jobs:
   prepare-linux:
     name: Prepare Linux build container
     needs: prepare-matrices
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Use custom container image if specified
-        if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
-          >> $GITHUB_ENV
-      - name: Use default container image and resolve digest
-        if: ${{ github.event.inputs.override_container_image == '' }}
-        run: |
-          echo "inner_container_image=$(cat ./building/linux-container-image.txt)" >> $GITHUB_ENV
-    outputs:
-      container_image: ${{ env.inner_container_image }}
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/linux-container-image.txt
 
   build-linux-app:
     name: Build Linux App

.github/workflows/resolve-container-image.yml

@@ -0,0 +1,37 @@
+---
+name: Resolve container images
+
+on:
+  workflow_call:
+    inputs:
+      override_container_image:
+        type: string
+        default: ""
+        description: "If set, use this image"
+      image_file:
+        description: "Path to a file containing the default image ref"
+        required: true
+    outputs:
+      container_image:
+        description: "Resolved image reference"
+        value: ${{ jobs.prepare-container.outputs.container_image }}
+
+permissions: {}
+
+jobs:
+  prepare-container:
+    runs-on: ubuntu-latest
+    outputs:
+      container_image: ${{ steps.resolve.outputs.image }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Use custom container image if specified
+        if: ${{ inputs.linux_override_container_image != '' }}
+        run: echo "image=${{ github.event.inputs.linux_override_container_image }}"
+          >> $GITHUB_OUTPUT
+
+      - name: Use default container image and resolve digest
+        if: ${{ inputs.linux_override_container_image == '' }}
+        run: echo "image=$(cat ${{ github.event.inputs.image_file }})" >> $GITHUB_OUTPUT

.github/workflows/rust-unused-dependencies.yml

@@ -15,25 +15,21 @@ env:
 permissions: {}
 
 jobs:
-  prepare-containers:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Fetch container image names
-        run: |
-          echo "inner_container_image_linux=$(cat ./building/linux-container-image.txt)" >> $GITHUB_ENV
-          echo "inner_container_image_android=$(cat ./building/android-container-image.txt)" >> $GITHUB_ENV
+  prepare-linux:
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/linux-container-image.txt
 
-    outputs:
-      container_image_linux: ${{ env.inner_container_image_linux }}
-      container_image_android: ${{ env.inner_container_image_android }}
+  prepare-android:
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/android-container-image.txt
 
   cargo-udeps-linux:
-    needs: prepare-containers
+    needs: prepare-linux
     runs-on: ubuntu-latest
     container:
-      image: ${{ needs.prepare-containers.outputs.container_image_linux }}
+      image: ${{ needs.prepare-linux.outputs.container_image }}
 
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:
@@ -62,10 +58,10 @@ jobs:
         run: source env.sh && cargo udeps --workspace
 
   cargo-udeps-android:
-    needs: prepare-containers
+    needs: prepare-android
     runs-on: ubuntu-latest
     container:
-      image: ${{ needs.prepare-containers.outputs.container_image_android }}
+      image: ${{ needs.prepare-android.outputs.container_image }}
 
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:

.github/workflows/testframework.yml

@@ -30,22 +30,9 @@ permissions: {}
 
 jobs:
   prepare-build-test-framework-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Use custom container image if specified
-        if: ${{ github.event.inputs.override_container_image != '' }}
-        run: echo "inner_container_image=${{ github.event.inputs.override_container_image }}"
-          >> $GITHUB_ENV
-
-      - name: Use default container image and resolve digest
-        if: ${{ github.event.inputs.override_container_image == '' }}
-        run: echo "inner_container_image=$(cat ./building/linux-container-image.txt)" >> $GITHUB_ENV
-
-    outputs:
-      container_image: ${{ env.inner_container_image }}
+    uses: ./.github/workflows/resolve-container-image.yml
+    with:
+      image_file: ./building/linux-container-image.txt
 
   # Build the test runner + test manager at once.
   build-test-framework-linux: