From fb26284c00e09e656732eb7ca4570afd052e0067 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Fri, 21 Jun 2024 11:47:01 +0000 Subject: [PATCH] Improve error reporting in CAS ticket validation --- .github/workflows/update-deps.yml | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index 704a7ae..f0e05a0 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -1,23 +1,30 @@ on: schedule: - cron: '41 8 * * *' + workflow_dispatch: name: Update dependencies + +permissions: {} jobs: update: name: Update dependencies runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write steps: - id: checkout name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - id: java name: Install Java and Maven - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: - java-version: 8 + distribution: zulu + java-version: 17 - id: update_keycloak name: Update Keycloak @@ -27,20 +34,23 @@ - id: vars name: Get project variables run: | - echo -n "::set-output name=versionUpdated::" - [ -f pom.xml.versionsBackup ] && echo 1 || echo 0 - echo -n "::set-output name=keycloakVersion::" - mvn -q help:evaluate -Dexpression=keycloak.version -DforceStdout 2> /dev/null | grep -E '^[0-9a-zA-Z.-]+$' + if [ -f pom.xml.versionsBackup ]; then + echo "versionUpdated=1" + else + echo "versionUpdated=0" + fi >> $GITHUB_OUTPUT + echo -n "keycloakVersion=" >> $GITHUB_OUTPUT + mvn -q help:evaluate -Dexpression=keycloak.version -DforceStdout 2> /dev/null | grep -E '^[0-9a-zA-Z.-]+$' >> $GITHUB_OUTPUT - id: check_branch name: Check if branch exists run: | - echo -n "::set-output name=commit::" + echo -n "commit=" >> $GITHUB_OUTPUT if [ '${{ steps.vars.outputs.versionUpdated }}' == '1' ]; then git ls-remote origin 'feature/keycloak-update-${{ steps.vars.outputs.keycloakVersion }}' else git rev-parse HEAD - fi + fi >> $GITHUB_OUTPUT - id: reset_repo name: Reset repository @@ -57,6 +67,7 @@ -DremotePom='org.keycloak:keycloak-parent:${{ steps.vars.outputs.keycloakVersion }}' \ -DupdateDependencies=true -DupdatePropertyVersions=true mvn versions:use-latest-versions -DallowMajorUpdates=false + mvn versions:set-property -Dproperty=project.build.outputTimestamp -DnewVersion=`date +%s` - id: create_commit name: Create commit @@ -77,21 +88,20 @@ name: Set access token if: steps.check_branch.outputs.commit == '' run: | - echo -n "::set-env name=GH_TOKEN::" if [ '${{ secrets.GH_TOKEN }}' != '' ]; then - echo '${{ secrets.GH_TOKEN }}' + echo 'GH_TOKEN=${{ secrets.GH_TOKEN }}' >> $GITHUB_ENV else - echo '${{ secrets.GITHUB_TOKEN }}' + echo 'GH_TOKEN=${{ secrets.GITHUB_TOKEN }}' >> $GITHUB_ENV fi - id: create_pull_request_default_token name: Create pull request if: steps.check_branch.outputs.commit == '' - uses: actions/github-script@0.9.0 + uses: actions/github-script@v6 with: github-token: ${{ env.GH_TOKEN }} script: | - github.pulls.create({ + github.rest.pulls.create({ owner: context.repo.owner, repo: context.repo.repo, head: 'feature/keycloak-update-${{ steps.vars.outputs.keycloakVersion }}', -- Gitblit v1.9.1