Adding the inverted conditions

.github/workflows/build-and-push-docker-builders.yml

@@ -10,12 +10,79 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - name: Git Checkout
+        uses: actions/checkout@v2
         with:
           ref: ${{ github.event.inputs.ref }}
-      - name: Build and Push Docker Images to Github Container Registry
-        shell: bash
-        run: ./distributions/scripts/build-and-push-docker-builders.sh
-        env:
-          DOCKER_USERNAME: ${{ secrets.GIT_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.GIT_PACKAGE_TOKEN }}
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GIT_USERNAME }}
+          password: ${{ secrets.GIT_PACKAGE_TOKEN }}
+      - name: Build and Push graalvm-ce-21.3.0-java11
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: distributions/docker-builders/Dockerfile-nativeimage
+          build-args: FROM_VERSION=java11-21.3.0
+          tags: ghcr.io/optum/ci/nativeimage:graalvm-ce-21.3.0-java11
+          push: true
+      - name: Build and Push graalvm-ce-21.3.0-java17
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: distributions/docker-builders/Dockerfile-nativeimage
+          build-args: FROM_VERSION=java17-21.3.0
+          tags: ghcr.io/optum/ci/nativeimage:graalvm-ce-21.3.0-java17
+          push: true
+      - name: Build and Push rpmbuild centos7
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: distributions/docker-builders/Dockerfile-rpmbuild
+          build-args: FROM=centos:7
+          tags: ghcr.io/optum/ci/rpmbuild:centos7
+          push: true
+      - name: Build and Push rpmbuild centos8
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: distributions/docker-builders/Dockerfile-rpmbuild
+          build-args: FROM=centos:8
+          tags: ghcr.io/optum/ci/rpmbuild:centos8
+          push: true
+      - name: Build and Push rpmbuild fedora33
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: distributions/docker-builders/Dockerfile-rpmbuild
+          build-args: FROM=fedora:33
+          tags: ghcr.io/optum/ci/rpmbuild:fedora33
+          push: true
+      - name: Build and Push rpmbuild fedora34
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: distributions/docker-builders/Dockerfile-rpmbuild
+          build-args: FROM=fedora:34
+          tags: ghcr.io/optum/ci/rpmbuild:fedora34
+          push: true
+      - name: Build and Push rpmbuild fedora35
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: distributions/docker-builders/Dockerfile-rpmbuild
+          build-args: FROM=fedora:35
+          tags: ghcr.io/optum/ci/rpmbuild:fedora35
+          push: true

.github/workflows/maven-ci.yml

@@ -79,26 +79,26 @@ jobs:
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_GPG_PASSPHRASE: ${{ secrets.SONATYPE_GPG_PASSPHRASE }}
       - name: Archive Native Image JAR
-        if: success()
+        if: success() && (matrix.java == '11')
         uses: actions/upload-artifact@v2
         with:
           name: native-image-${{ matrix.java }}
           path: cli/target/*-native-image.jar
       - name: Archive Bash Completion Script
-        if: success()
+        if: success() && (matrix.java == '11')
         uses: actions/upload-artifact@v2
         with:
           name: bash-completion-script-${{ matrix.java }}
           path: cli/target/sourcehawk-bash-completion.sh
       - name: Archive Manpages
-        if: success()
+        if: success() && (matrix.java == '11')
         uses: actions/upload-artifact@v2
         with:
           name: manpages-${{ matrix.java }}
           path: gh-pages/manpages/sourcehawk*.1
       - name: Aggregate Coverage Reports
         id: aggregate_coverage_reports
-        if: success()
+        if: success() && (matrix.java == '11')
         run: echo ::set-output name=JACOCO_XML_REPORT_PATHS::$(find . -name "jacoco.xml" -printf '%P\n' | tr '\r\n' ',')
       - name: Analyze with SonarCloud
         if: success() && (github.event_name == 'push' && matrix.java == '11')
@@ -120,29 +120,26 @@ jobs:
     steps:
       - uses: actions/download-artifact@v2
         with:
-          name: native-image-8
+          name: native-image-11
           path: build
       - uses: actions/download-artifact@v2
         with:
-          name: bash-completion-script-8
+          name: bash-completion-script-11
           path: build
       - uses: actions/download-artifact@v2
         with:
-          name: manpages-8
+          name: manpages-11
           path: build
       - name: Rename Native Image JAR
         working-directory: build
         run: mv *.jar native-image.jar
-      - name: Setup Java
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8
       - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@master
+        uses: graalvm/setup-graalvm@v1
         with:
-          graalvm-version: 21.2.0.java8
-      - name: Setup GraalVM Native Image Tool
-        run: gu install native-image
+          version: '21.3.0'
+          java-version: '11'
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build Mac Native Image
         if: success()
         working-directory: build
@@ -172,6 +169,7 @@ jobs:
   build-windows-native-image:
     runs-on: windows-latest
     needs: build
+    continue-on-error: true
     steps:
       - uses: actions/download-artifact@v2
         with:
@@ -180,20 +178,16 @@ jobs:
       - name: Rename Native Image JAR
         working-directory: build
         run: ren *.jar native-image.jar
-      - name: Setup GraalVM Native Image and Visual C Build Tools
-        run: |
-          Invoke-RestMethod -Uri https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java11-windows-amd64-21.3.0.zip -OutFile 'graal.zip'
-          Expand-Archive -path 'graal.zip' -destinationpath '.'
-          graalvm-ce-java11-21.3.0\bin\gu.cmd install native-image
-          choco install visualstudio2017-workload-vctools
+      - name: Setup GraalVM
+        uses: graalvm/setup-graalvm@v1
+        with:
+          version: '20.3.0'
+          java-version: '11'
+          components: 'native-image'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build Windows Native Image
         if: success()
-        shell: cmd
-        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
-          graalvm-ce-java11-21.3.0\bin\native-image -cp .\build\native-image.jar -H:+ReportExceptionStackTraces --report-unsupported-elements-at-runtime
-        env:
-          JAVA_HOME: ./graalvm-ce-java11-21.3.0
+        run: native-image.cmd -cp .\build\native-image.jar -H:+ReportExceptionStackTraces --report-unsupported-elements-at-runtime
       - name: Archive Windows Native Image
         if: success()
         continue-on-error: true
@@ -204,4 +198,4 @@ jobs:
       - name: Smoke Test
         if: success()
         shell: cmd
-        run: sourcehawk.exe help
+        run: sourcehawk.exe help