Skip to content

Commit

Permalink
Merge branch 'master' into jwt-claims
Browse files Browse the repository at this point in the history
  • Loading branch information
mpmadhavig authored Nov 13, 2024
2 parents 8c389b7 + f99c2d5 commit 52b63a9
Show file tree
Hide file tree
Showing 19 changed files with 193 additions and 401 deletions.
161 changes: 0 additions & 161 deletions .github/workflows/dependency-updater-7.yml

This file was deleted.

14 changes: 11 additions & 3 deletions .github/workflows/dependency-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
JAVA_TOOL_OPTIONS: "-Djdk.util.zip.disableZip64ExtraFieldValidation=true -Djdk.nio.zipfs.allowDotZipEntry=true"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Adopt JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: "11"
distribution: "adopt"
Expand All @@ -37,7 +37,7 @@ jobs:
echo $JAVA_HOME
- name: Cache local Maven repository
id: cache-maven-m2
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-m2
with:
Expand Down Expand Up @@ -161,6 +161,14 @@ jobs:
path: |
${{steps.builder_step.outputs.REPO_NAME}}/mvn-build.log
if-no-files-found: warn
- name: Archive heap dump
if: always()
uses: actions/upload-artifact@v4
with:
name: heap-dump
path: |
product-is/**/heap-dump.hprof
if-no-files-found: ignore
- name: Google Chat Notification
run: |
STATUS_COLOR=$(if [[ ${{ job.status }} == "success" ]];then echo "#009944";
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/fapi-oidc-conformance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: './product-is'

- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11.0.18+10

Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
python3 ./configure_is_fapi.py ../../$PRODUCT_IS_ZIP
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fork-branch-deleter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
# Check out the product-is fork of 'jenkins-is-staging' user
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
token: ${{ secrets.PAT }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa-scanner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
fossa-scan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: fossas/fossa-action@main
with:
api-key: ${{secrets.FOSSAAPIKEY}}
14 changes: 7 additions & 7 deletions .github/workflows/migration-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
runs-on: ${{ github.event.inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup Docker environment
run: |
# Get the ID of the workflow from the GitHub API using curl and jq
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
runs-on: ${{ github.event.inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Execute Migration Automation Script Ubuntu
run: |
chmod +x ${{ github.workspace }}/.github/migration-tester/migration-automation/ubuntu-os/migration-script-ubuntu.sh
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Create MS SQL Database
run: |
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
runs-on: ${{ github.event.inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Execute Migration Automation Script Mac
run: |
Expand All @@ -240,7 +240,7 @@ jobs:
if: ${{ github.event.inputs.database == 'postgres' && github.event.inputs.os == 'macos-latest' }}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up PostgreSQL
env:
PGDATA: /usr/local/var/postgres
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
runs-on: ${{ github.event.inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: potatoqualitee/mssqlsuite@v1.7
with:
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
runs-on: ${{ github.event.inputs.os }}
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Download Artifacts
uses: actions/download-artifact@v2
if: always()
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/oidc-conformance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: './product-is'

- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11.0.18+10

Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
python3 ./configure_is.py ../../$PRODUCT_IS_ZIP $ROOT_DIR $ROOT_DIR/jacoco.exec
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
Expand Down
Loading

0 comments on commit 52b63a9

Please sign in to comment.