Skip to content

Commit 38b1fbe

Browse files
committed
Merge branch 'main' into v492-15
2 parents eaf5034 + cbd8930 commit 38b1fbe

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/ci-buildmatrix-cpp11.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
2323
- name: Upload source artifact
2424
# v4 okay here (runs on ubuntu host with modern glibc)
25-
uses: actions/upload-artifact@v6
25+
uses: actions/upload-artifact@v7
2626
with:
2727
name: src
2828
path: src.tgz
@@ -35,7 +35,7 @@ jobs:
3535
ROOT_IMAGE: rootproject/root:6.24.06-centos7
3636
steps:
3737
- name: Download source artifact
38-
uses: actions/download-artifact@v7
38+
uses: actions/download-artifact@v8
3939
with:
4040
name: src
4141

@@ -84,7 +84,7 @@ jobs:
8484
8585
- name: Upload build artifacts
8686
if: always()
87-
uses: actions/upload-artifact@v6
87+
uses: actions/upload-artifact@v7
8888
with:
8989
name: build-artifacts
9090
path: build-artifacts.tgz

.github/workflows/vts-eventdisplay-package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ jobs:
3939
fi
4040
4141
- name: Log in to the Container registry
42-
uses: docker/login-action@v3
42+
uses: docker/login-action@v4
4343
with:
4444
registry: ${{ env.REGISTRY }}
4545
username: ${{ github.actor }}
4646
password: ${{ secrets.GITHUB_TOKEN }}
4747

4848
- name: Extract metadata (tags, labels) for Docker
4949
id: meta
50-
uses: docker/metadata-action@v5
50+
uses: docker/metadata-action@v6
5151
with:
5252
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5353

5454
- name: Build and push Docker image
55-
uses: docker/build-push-action@v6
55+
uses: docker/build-push-action@v7
5656
with:
5757
context: .
5858
build-args: BUILD_BRANCH=${{ env.BUILD_BRANCH }}

0 commit comments

Comments
 (0)