Removes Java 18 (EOGS), fixes 11 & 17 version patterns (#263)

paketo-buildpacks · Nov 19, 2022 · 2761921 · 2761921
1 parent 0a19743
commit 2761921
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 259 deletions.
diff --git a/.github/pipeline-descriptor.yml b/.github/pipeline-descriptor.yml
@@ -44,7 +44,7 @@ dependencies:
     token: ${{ secrets.JAVA_GITHUB_TOKEN }}
 - name:            JDK 11
   id:              jdk
-  version_pattern: "11(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
+  version_pattern: "^11(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
   cpe_pattern:    "[\\d]+\\.[\\d]+\\.[\\d]+"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
@@ -55,7 +55,7 @@ dependencies:
     token: ${{ secrets.JAVA_GITHUB_TOKEN }}
 - name:            JRE 11
   id:              jre
-  version_pattern: "11(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
+  version_pattern: "^11(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
   cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
@@ -66,7 +66,7 @@ dependencies:
     token: ${{ secrets.JAVA_GITHUB_TOKEN }}
 - name:            JDK 17
   id:              jdk
-  version_pattern: "17(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
+  version_pattern: "^17(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
   cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
@@ -77,7 +77,7 @@ dependencies:
     token: ${{ secrets.JAVA_GITHUB_TOKEN }}
 - name:            JRE 17
   id:              jre
-  version_pattern: "17(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
+  version_pattern: "^17(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
   cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
   uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
   with:
@@ -86,26 +86,3 @@ dependencies:
     repository: semeru17-binaries
     tag_filter: jdk(.*17.*)
     token: ${{ secrets.JAVA_GITHUB_TOKEN }}
-- name:            JDK 18
-  id:              jdk
-  version_pattern: "18(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
-  uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
-  with:
-    glob: ibm-semeru-open-jdk_x64_linux_.+_openj9-.+.tar.gz
-    owner: ibmruntimes
-    repository: semeru18-binaries
-    tag_filter: jdk(.*18.*)
-    token: ${{ secrets.JAVA_GITHUB_TOKEN }}
-- name:            JRE 18
-  id:              jre
-  version_pattern: "18(?:\\.[\\d]+(?:\\.[\\d]+)?)?"
-  cpe_pattern:     "[\\d]+\\.[\\d]+\\.[\\d]+"
-  uses:            docker://ghcr.io/paketo-buildpacks/actions/ibm-semeru-dependency:main
-  with:
-    glob: ibm-semeru-open-jre_x64_linux_.+_openj9-.+.tar.gz
-    owner: ibmruntimes
-    repository: semeru18-binaries
-    tag_filter: jdk(.*18.*)
-    token: ${{ secrets.JAVA_GITHUB_TOKEN }}
-
diff --git a/.github/workflows/pb-update-jdk-11.yml b/.github/workflows/pb-update-jdk-11.yml
@@ -97,7 +97,7 @@ jobs:
                 SHA256: ${{ steps.dependency.outputs.sha256 }}
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
-                VERSION_PATTERN: 11(?:\.[\d]+(?:\.[\d]+)?)?
+                VERSION_PATTERN: ^11(?:\.[\d]+(?:\.[\d]+)?)?
             - uses: peter-evans/create-pull-request@v4
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>

diff --git a/.github/workflows/pb-update-jdk-17.yml b/.github/workflows/pb-update-jdk-17.yml
@@ -97,7 +97,7 @@ jobs:
                 SHA256: ${{ steps.dependency.outputs.sha256 }}
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
-                VERSION_PATTERN: 17(?:\.[\d]+(?:\.[\d]+)?)?
+                VERSION_PATTERN: ^17(?:\.[\d]+(?:\.[\d]+)?)?
             - uses: peter-evans/create-pull-request@v4
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>

diff --git a/.github/workflows/pb-update-jdk-18.yml b/.github/workflows/pb-update-jdk-18.yml
diff --git a/.github/workflows/pb-update-jre-11.yml b/.github/workflows/pb-update-jre-11.yml
@@ -97,7 +97,7 @@ jobs:
                 SHA256: ${{ steps.dependency.outputs.sha256 }}
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
-                VERSION_PATTERN: 11(?:\.[\d]+(?:\.[\d]+)?)?
+                VERSION_PATTERN: ^11(?:\.[\d]+(?:\.[\d]+)?)?
             - uses: peter-evans/create-pull-request@v4
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>

diff --git a/.github/workflows/pb-update-jre-17.yml b/.github/workflows/pb-update-jre-17.yml
@@ -97,7 +97,7 @@ jobs:
                 SHA256: ${{ steps.dependency.outputs.sha256 }}
                 URI: ${{ steps.dependency.outputs.uri }}
                 VERSION: ${{ steps.dependency.outputs.version }}
-                VERSION_PATTERN: 17(?:\.[\d]+(?:\.[\d]+)?)?
+                VERSION_PATTERN: ^17(?:\.[\d]+(?:\.[\d]+)?)?
             - uses: peter-evans/create-pull-request@v4
               with:
                 author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>

diff --git a/.github/workflows/pb-update-jre-18.yml b/.github/workflows/pb-update-jre-18.yml
diff --git a/.github/workflows/update-go.yml b/.github/workflows/update-go.yml
@@ -0,0 +1,61 @@
+name: Update Go
+"on":
+    schedule:
+        - cron: 0 2 * * 1
+    workflow_dispatch: {}
+jobs:
+    update:
+        name: Update Go
+        runs-on:
+            - ubuntu-latest
+        steps:
+            - uses: actions/setup-go@v3
+              with:
+                go-version: "1.18"
+            - uses: actions/checkout@v3
+            - name: Update Go Version
+              id: update-go
+              run: |
+                #!/usr/bin/env bash
+
+                set -euo pipefail
+
+                if [ -z "${GO_VERSION:-}" ]; then
+                    echo "No go version set"
+                    exit 1
+                fi
+
+                OLD_GO_VERSION=$(grep -P '^go \d\.\d+' go.mod | cut -d ' ' -f 2)
+
+                go mod edit -go="$GO_VERSION"
+                go mod tidy
+                go get -u all
+                go mod tidy
+
+                git add go.mod go.sum
+                git checkout -- .
+
+                echo "::set-output name=old-go-version::${OLD_GO_VERSION}"
+                echo "::set-output name=go-version::${GO_VERSION}"
+              env:
+                GO_VERSION: "1.18"
+            - uses: peter-evans/create-pull-request@v4
+              with:
+                author: ${{ secrets.JAVA_GITHUB_USERNAME }} <${{ secrets.JAVA_GITHUB_USERNAME }}@users.noreply.github.com>
+                body: |-
+                    Bumps Go from `${{ steps.update-go.outputs.old-go-version }}` to `${{ steps.update-go.outputs.go-version }}`.
+
+                    <details>
+                    <summary>Release Notes</summary>
+                    ${{ steps.pipeline.outputs.release-notes }}
+                    </details>
+                branch: update/go
+                commit-message: |-
+                    Bump Go from ${{ steps.update-go.outputs.old-go-version }} to ${{ steps.update-go.outputs.go-version }}
+
+                    Bumps Go from ${{ steps.update-go.outputs.old-go-version }} to ${{ steps.update-go.outputs.go-version }}.
+                delete-branch: true
+                labels: semver:minor, type:task
+                signoff: true
+                title: Bump Go from ${{ steps.update-go.outputs.old-go-version }} to ${{ steps.update-go.outputs.go-version }}
+                token: ${{ secrets.JAVA_GITHUB_TOKEN }}