Merge branch 'master' into align-with-docker-ssh-agent-process

jenkinsci · Jun 23, 2024 · cd389b3 · cd389b3
2 parents fdbaacb + 3c4d2b1
commit cd389b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml
@@ -18,12 +18,12 @@ jobs:
         uses: updatecli/updatecli-action@v2.61.0
 
       - name: Run Updatecli in Dry Run mode
-        run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml --values ./updatecli/values.temurin.yaml
+        run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml
         env:
           UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run Updatecli in Apply mode
         if: github.ref == 'refs/heads/master'
-        run: updatecli apply --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml --values ./updatecli/values.temurin.yaml
+        run: updatecli apply --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml
         env:
           UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/updatecli/values.github-action.yaml b/updatecli/values.github-action.yaml
@@ -6,3 +6,5 @@ github:
   branch: "master"
   owner: "jenkinsci"
   repository: "docker-agent"
+temurin:
+  version_pattern: "^jdk-[11|17|21].(\\d*).(\\d*).(\\d*)(.(\\d*))\\+(\\d*)?$"
diff --git a/updatecli/values.temurin.yaml b/updatecli/values.temurin.yaml