macos-11 github runner no longer available, remove jdk8u mac github a…

…ction build (#3859)
adoptium · Jun 20, 2024 · b6595f6 · b6595f6
1 parent 738e41c
commit b6595f6
Showing 1 changed file with 4 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -133,7 +133,6 @@ jobs:
       matrix:
         os: [macOS]
         version: [
-          { name: jdk8u, distro: macos-11 },
           { name: jdk11u, distro: macos-14 },
           { name: jdk17u, distro: macos-14 }
         ]
@@ -167,21 +166,7 @@ jobs:
       run: |
         brew install automake bash binutils freetype gnu-sed nasm
 
-    - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
-      id: setup-java
-      with:
-        java-version: 7
-        distribution: 'zulu'
-      if: matrix.version.name == 'jdk8u'
-
-    - name: Select correct Xcode (JDK8)
-      if: matrix.version.name == 'jdk8u'
-      run: |
-        rm -rf /Applications/Xcode.app
-        ln -s /Applications/Xcode_11.7.app /Applications/Xcode.app
-
     - name: Select correct Xcode (JDK11+)
-      if: matrix.version.name != 'jdk8u'
       run: |
         rm -rf /Applications/Xcode.app
         ln -s /Applications/Xcode_15.2.app /Applications/Xcode.app
@@ -190,22 +175,16 @@ jobs:
       run: |
         export JAVA_HOME=$JAVA_HOME_11_X64
         # jdk11u+ uses two part exploded & assemble build
-        if [ ${{ matrix.version.name }} != "jdk8u" ]; then
-          export BUILD_ARGS="--make-exploded-image --create-sbom"
-          ./build-farm/make-adopt-build-farm.sh
-          export BUILD_ARGS="--assemble-exploded-image --create-sbom"
-          ./build-farm/make-adopt-build-farm.sh
-        else
-          export BUILD_ARGS="--create-sbom"
-          ./build-farm/make-adopt-build-farm.sh
-        fi
+        export BUILD_ARGS="--make-exploded-image --create-sbom"
+        ./build-farm/make-adopt-build-farm.sh
+        export BUILD_ARGS="--assemble-exploded-image --create-sbom"
+        ./build-farm/make-adopt-build-farm.sh
       env:
         JAVA_TO_BUILD: ${{ matrix.version.name }}
         ARCHITECTURE: x64
         VARIANT: ${{ matrix.variant }}
         TARGET_OS: mac
         FILENAME: OpenJDK.tar.gz
-        JDK7_BOOT_DIR: ${{ steps.setup-java.outputs.path }}
 
     - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
       name: Collect and Archive Artifacts