Skip to content

Commit b2f7d1d

Browse files
Copilotvharseko
Copilot
and
vharseko
authored
Merge branch 'master' into copilot/update-tests-for-4-arg-method
Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
2 parents d11c9d5 + 8dbcb13 commit b2f7d1d

3 files changed

Lines changed: 28 additions & 29 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches: [ 'sustaining/5.4.x','master' ]
66
pull_request:
7-
87
jobs:
98
build-maven:
109
runs-on: ${{ matrix.os }}
@@ -14,17 +13,17 @@ jobs:
1413
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
1514
fail-fast: false
1615
steps:
17-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v6
1817
with:
1918
fetch-depth: 0
2019
submodules: recursive
2120
- name: Java ${{ matrix.Java }} (${{ matrix.os }})
22-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2322
with:
2423
java-version: ${{ matrix.java }}
2524
distribution: 'zulu'
2625
- name: Cache Maven packages
27-
uses: actions/cache@v4
26+
uses: actions/cache@v5
2827
with:
2928
path: ~/.m2/repository
3029
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
@@ -34,7 +33,7 @@ jobs:
3433
MAVEN_OPTS: -Dhttps.protocols=TLSv1.2 -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.requestSentEnabled=true -Dmaven.wagon.http.retryHandler.count=10
3534
run: mvn --batch-mode --errors --update-snapshots package --file pom.xml
3635
- name: Upload artifacts
37-
uses: actions/upload-artifact@v4
36+
uses: actions/upload-artifact@v7
3837
with:
3938
name: ${{ matrix.os }}-${{ matrix.java }}
4039
retention-days: 5
@@ -51,7 +50,7 @@ jobs:
5150
- 5000:5000
5251
steps:
5352
- name: Download artifacts
54-
uses: actions/download-artifact@v4
53+
uses: actions/download-artifact@v8
5554
with:
5655
name: ubuntu-latest-11
5756
- name: Get latest release version
@@ -61,24 +60,24 @@ jobs:
6160
echo "release_version=$git_version_last" >> $GITHUB_ENV
6261
- name: Docker meta
6362
id: meta
64-
uses: docker/metadata-action@v5
63+
uses: docker/metadata-action@v6
6564
with:
6665
images: |
6766
localhost:5000/${{ github.repository }}
6867
tags: |
6968
type=raw,value=latest
7069
type=raw,value=${{ env.release_version }}
7170
- name: Set up QEMU
72-
uses: docker/setup-qemu-action@v3
71+
uses: docker/setup-qemu-action@v4
7372
- name: Set up Docker Buildx
74-
uses: docker/setup-buildx-action@v3
73+
uses: docker/setup-buildx-action@v4
7574
with:
7675
driver-opts: network=host
7776
- name: Prepare Dockerfile
7877
shell: bash
7978
run: sed -i -E '/^#COPY openig-war\//s/^#//' ./openig-docker/target/Dockerfile
8079
- name: Build image
81-
uses: docker/build-push-action@v5
80+
uses: docker/build-push-action@v7
8281
continue-on-error: true
8382
with:
8483
context: .

‎.github/workflows/deploy.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ jobs:
1515
env:
1616
GITHUB_CONTEXT: ${{ toJSON(github) }}
1717
run: echo "$GITHUB_CONTEXT"
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919
with:
2020
fetch-depth: 0
2121
submodules: recursive
2222
ref: ${{ github.event.workflow_run.head_branch }}
2323
- name: Set up Java for publishing to Maven Central Repository OSS
24-
uses: actions/setup-java@v4
24+
uses: actions/setup-java@v5
2525
with:
2626
java-version: ${{ github.event.workflow_run.head_branch == 'sustaining/5.4.x' && '8' || '11'}}
2727
distribution: 'temurin'
2828
server-id: ossrh
2929
server-username: MAVEN_USERNAME
3030
server-password: MAVEN_PASSWORD
3131
- name: Cache Maven packages
32-
uses: actions/cache@v4
32+
uses: actions/cache@v5
3333
with:
3434
path: ~/.m2/repository
3535
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
@@ -58,12 +58,12 @@ jobs:
5858
- name: Build Javadoc
5959
run: mvn javadoc:aggregate -pl '!openig-war' -pl '!openig-ui'
6060
- name: Upload artifacts OpenIG Server Only Component
61-
uses: actions/upload-artifact@v4
61+
uses: actions/upload-artifact@v7
6262
with:
6363
name: OpenIG Server
6464
path: openig-war/target/*.war
6565
- name: Upload artifacts OpenIG Dockerfile
66-
uses: actions/upload-artifact@v4
66+
uses: actions/upload-artifact@v7
6767
with:
6868
name: OpenIG Dockerfile
6969
path: openig-docker/target/Dockerfile*
@@ -72,7 +72,7 @@ jobs:
7272
git config --global user.name "Open Identity Platform Community"
7373
git config --global user.email "open-identity-platform-opendj@googlegroups.com"
7474
cd ..
75-
- uses: actions/checkout@v4
75+
- uses: actions/checkout@v6
7676
continue-on-error: true
7777
with:
7878
repository: ${{ github.repository }}.wiki
@@ -92,7 +92,7 @@ jobs:
9292
git commit -a -m "upload docs after deploy ${{ github.sha }}"
9393
git push --quiet --force
9494
95-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@v6
9696
continue-on-error: true
9797
with:
9898
repository: OpenIdentityPlatform/doc.openidentityplatform.org

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ jobs:
1919
env:
2020
GITHUB_CONTEXT: ${{ toJSON(github) }}
2121
run: echo "$GITHUB_CONTEXT"
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525
submodules: recursive
2626
- name: Set up Java for publishing to Maven Central Repository OSS
27-
uses: actions/setup-java@v4
27+
uses: actions/setup-java@v5
2828
with:
2929
java-version: ${{ github.event.workflow_run.head_branch == 'sustaining/5.4.x' && '8' || '11'}}
3030
distribution: 'temurin'
3131
server-id: ossrh
3232
server-username: MAVEN_USERNAME
3333
server-password: MAVEN_PASSWORD
3434
- name: Cache Maven packages
35-
uses: actions/cache@v4
35+
uses: actions/cache@v5
3636
with:
3737
path: ~/.m2/repository
3838
key: ${{ runner.os }}-m2-repository-${{ hashFiles('**/pom.xml') }}
@@ -71,7 +71,7 @@ jobs:
7171
target/checkout/openig-war/target/*.war
7272
target/checkout/openig-docker/target/Dockerfile*
7373
74-
- uses: actions/checkout@v4
74+
- uses: actions/checkout@v6
7575
continue-on-error: true
7676
with:
7777
repository: ${{ github.repository }}.wiki
@@ -93,7 +93,7 @@ jobs:
9393
git tag -f ${{ github.event.inputs.releaseVersion }}
9494
git push --quiet --force
9595
git push --quiet --force origin ${{ github.event.inputs.releaseVersion }}
96-
- uses: actions/checkout@v4
96+
- uses: actions/checkout@v6
9797
continue-on-error: true
9898
with:
9999
repository: OpenIdentityPlatform/doc.openidentityplatform.org
@@ -113,14 +113,14 @@ jobs:
113113
needs:
114114
- release-maven
115115
steps:
116-
- uses: actions/checkout@v4
116+
- uses: actions/checkout@v6
117117
with:
118118
ref: ${{ github.event.inputs.releaseVersion }}
119119
fetch-depth: 1
120120
submodules: recursive
121121
- name: Docker meta
122122
id: meta
123-
uses: docker/metadata-action@v5
123+
uses: docker/metadata-action@v6
124124
with:
125125
images: |
126126
${{ github.repository }}
@@ -129,22 +129,22 @@ jobs:
129129
type=raw,value=latest
130130
type=raw,value=${{ github.event.inputs.releaseVersion }}
131131
- name: Set up QEMU
132-
uses: docker/setup-qemu-action@v3
132+
uses: docker/setup-qemu-action@v4
133133
- name: Set up Docker Buildx
134-
uses: docker/setup-buildx-action@v3
134+
uses: docker/setup-buildx-action@v4
135135
- name: Login to DockerHub
136-
uses: docker/login-action@v3
136+
uses: docker/login-action@v4
137137
with:
138138
username: ${{ secrets.DOCKER_USERNAME }}
139139
password: ${{ secrets.DOCKER_PASSWORD }}
140140
- name: Login to GHCR
141-
uses: docker/login-action@v3
141+
uses: docker/login-action@v4
142142
with:
143143
registry: ghcr.io
144144
username: ${{ github.repository_owner }}
145145
password: ${{ secrets.GITHUB_TOKEN }}
146146
- name: Build and push image
147-
uses: docker/build-push-action@v5
147+
uses: docker/build-push-action@v7
148148
continue-on-error: true
149149
with:
150150
context: ./openig-docker

0 commit comments

Comments
 (0)