Skip to content

Commit 6afd660

Browse files
dependabot[bot]next-actions/backport
authored andcommitted
CONFLICT! ci: bump actions/upload-artifact from 5 to 6
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Reviewed-by: Justin Stephenson <jstephen@redhat.com> (cherry picked from commit 1280ffe)
1 parent f893fea commit 6afd660

File tree

3 files changed

+76
-3
lines changed

3 files changed

+76
-3
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
source ../contrib/fedora/bashrc_sssd
4848
make -j$PROCESSORS distcheck
4949
50-
- uses: actions/upload-artifact@v5
50+
- uses: actions/upload-artifact@v6
5151
if: always()
5252
with:
5353
name: build

.github/workflows/ci.yml

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,79 @@ jobs:
2323
id: matrix
2424
run: ./contrib/ci/get-matrix.py --action
2525

26+
<<<<<<< HEAD
27+
=======
28+
intgcheck:
29+
if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'Accepted')
30+
needs: [prepare]
31+
strategy:
32+
fail-fast: false
33+
matrix:
34+
tag: ${{ fromJson(needs.prepare.outputs.matrix).intgcheck }}
35+
runs-on: ubuntu-latest
36+
permissions:
37+
contents: read
38+
steps:
39+
- name: Checkout repository
40+
uses: actions/checkout@v6
41+
with:
42+
path: sssd
43+
44+
- name: Setup containers
45+
uses: SSSD/sssd-ci-containers/actions/setup@master
46+
with:
47+
path: sssd-ci-containers
48+
tag: ${{ matrix.tag }}
49+
limit: dns client
50+
override: |
51+
services:
52+
client:
53+
image: ${REGISTRY}/ci-client-devel:${TAG}
54+
volumes:
55+
- ../sssd:/sssd:rw
56+
57+
- name: Run integration tests
58+
uses: SSSD/sssd-ci-containers/actions/exec@master
59+
with:
60+
working-directory: /sssd
61+
script: ./contrib/ci/run --moderate
62+
63+
- name: Print logs
64+
uses: next-actions/print-logs@master
65+
if: always()
66+
with:
67+
working-directory: ./sssd/ci-build-debug
68+
files: |
69+
test-suite.log
70+
ci-make-intgcheck.log
71+
ci-make-distcheck.log
72+
73+
- name: Upload main artifacts
74+
if: always()
75+
uses: actions/upload-artifact@v6
76+
with:
77+
if-no-files-found: ignore
78+
name: ${{ matrix.tag }}-intgcheck
79+
path: |
80+
./sssd/var/log/sssd/*.log
81+
./sssd/ci-build-debug/ci-*.log
82+
./sssd/ci-build-debug/config.log
83+
./sssd/ci-build-debug/test-suite.log
84+
./sssd/ci-build-debug/ci-mock-result/*.log
85+
./sssd/ci-build-debug/src/tests/cwrap/test-suite.log
86+
./sssd/ci-install-deps.log
87+
./sssd/ci-autoreconf.log
88+
89+
- name: Upload valgrind artifacts
90+
if: always()
91+
uses: actions/upload-artifact@v6
92+
with:
93+
if-no-files-found: ignore
94+
name: ${{ matrix.tag }}-intgcheck-valgrind
95+
path: |
96+
./sssd/ci-build-debug/*.valgrind.log
97+
98+
>>>>>>> 1280ffe06 (ci: bump actions/upload-artifact from 5 to 6)
2699
system:
27100
if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'Accepted')
28101
needs: [prepare]
@@ -250,7 +323,7 @@ jobs:
250323
251324
- name: Upload artifacts
252325
if: always()
253-
uses: actions/upload-artifact@v5
326+
uses: actions/upload-artifact@v6
254327
with:
255328
if-no-files-found: ignore
256329
name: ${{ matrix.tag }}-system

.github/workflows/static-code-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
make -j$PROCESSORS
4040
4141
- name: Upload configuration artifacts
42-
uses: actions/upload-artifact@v5
42+
uses: actions/upload-artifact@v6
4343
if: always()
4444
with:
4545
name: codeql-build

0 commit comments

Comments
 (0)