Skip to content

Commit 399b259

Browse files
dependabot[bot]next-actions/backport
dependabot[bot]
authored and
next-actions/backport
committed
CONFLICT! ci: bump actions/checkout from 4 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v6) --- updated-dependencies: - dependency-name: actions/checkout 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 4d68ca7)
1 parent 3d0593f commit 399b259

File tree

7 files changed

+227
-1
lines changed

7 files changed

+227
-1
lines changed

‎.github/workflows/accepted.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333
with:
3434
# Fetch the entire history of the repository
3535
# This is necessary for a successful git push

‎.github/workflows/analyze-target.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ jobs:
1313
pull-requests: write
1414
steps:
1515
- name: Checkout repository
16+
<<<<<<< HEAD
1617
uses: actions/checkout@v3
18+
=======
19+
uses: actions/checkout@v6
20+
>>>>>>> 4d68ca714 (ci: bump actions/checkout from 4 to 6)
1721
with:
1822
ref: ${{ github.event.pull_request.head.sha }}
1923
persist-credentials: false

‎.github/workflows/build.yml‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
name: Build
2+
on:
3+
push:
4+
pull_request:
5+
# do not run if only system tests were edited inside a pull request
6+
paths-ignore:
7+
- 'src/tests/system/**'
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
jobs:
12+
make-distcheck:
13+
if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'Accepted')
14+
runs-on: ubuntu-latest
15+
container: quay.io/sssd/ci-client-devel:latest
16+
permissions:
17+
contents: read
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v6
21+
22+
- name: Install dependencies
23+
id: dependencies
24+
uses: ./.github/actions/install-dependencies
25+
26+
- name: Configure sssd
27+
uses: ./.github/actions/configure
28+
29+
- name: make
30+
shell: bash
31+
working-directory: x86_64
32+
run: |
33+
source ../contrib/fedora/bashrc_sssd
34+
make CFLAGS+="$SSS_WARNINGS -Werror" -j$PROCESSORS
35+
36+
- name: make check
37+
shell: bash
38+
working-directory: x86_64
39+
run: |
40+
source ../contrib/fedora/bashrc_sssd
41+
make CFLAGS+="$SSS_WARNINGS -Werror" -j$PROCESSORS check
42+
43+
- name: make distcheck
44+
shell: bash
45+
working-directory: x86_64
46+
run: |
47+
source ../contrib/fedora/bashrc_sssd
48+
make -j$PROCESSORS distcheck
49+
50+
- uses: actions/upload-artifact@v5
51+
if: always()
52+
with:
53+
name: build
54+
path: |
55+
x86_64/config.log
56+
x86_64/config.h
57+
x86_64/test-suite.log
58+
if-no-files-found: ignore
59+
60+
freebsd:
61+
if: github.event_name == 'push' || !contains(github.event.pull_request.labels.*.name, 'Accepted')
62+
runs-on: ubuntu-latest
63+
steps:
64+
- name: Repository checkout
65+
uses: actions/checkout@v6
66+
- uses: cross-platform-actions/action@v0.32.0
67+
with:
68+
operating_system: 'freebsd'
69+
version: '14.3'
70+
architecture: 'x86_64'
71+
run: |
72+
# Use latest package set
73+
sudo mkdir -p /usr/local/etc/pkg/repos/
74+
sudo cp /etc/pkg/FreeBSD.conf /usr/local/etc/pkg/repos/FreeBSD.conf
75+
sudo sed -i.bak -e 's|/quarterly|/latest|' /usr/local/etc/pkg/repos/FreeBSD.conf
76+
77+
# Trick SSSD into believing that nsupdate supports 'realm' clause
78+
# until FreeBSD switches to MIT Kerberos by default
79+
# Can be removed with FreeBSD 15
80+
sed -i.bak -e 's|echo realm|echo class IN|g' src/external/nsupdate.m4
81+
82+
# Patch out "timezone" variable usage - it is a legacy function in FreeBSD
83+
# Can be removed with FreeBSD 15
84+
sed -i.bak -e 's|timezone;|0;|g' src/util/util.c
85+
sed -i.bak -e 's|daylight,|0,|g' src/providers/ldap/ldap_auth.c \
86+
src/providers/ldap/sdap_access.c
87+
88+
echo "::group::Dependencies installation"
89+
sudo -E pkg install -y \
90+
autoconf automake gettext-tools gmake libtool pkgconf \
91+
ldb25 popt samba416 talloc tdb tevent \
92+
bind-tools c-ares ding-libs git jose libinotify libuuid libxml2 \
93+
libxslt krb5 pcre2 python3 xmlcatmgr docbook-xsl \
94+
py311-setuptools \
95+
check cmocka cwrap softhsm2
96+
echo "::endgroup::"
97+
98+
echo "::group::Build configuration"
99+
autoreconf -f -i
100+
101+
env CFLAGS=-isystem/usr/local/include \
102+
CPPFLAGS=-isystem/usr/local/include \
103+
LDFLAGS=-L/usr/local/lib \
104+
KRB5_CONFIG=/usr/local/bin/krb5-config \
105+
SOFTHSM2_PATH=/usr/local/lib/softhsm/libsofthsm2.so \
106+
MAKE=gmake \
107+
LIBS=-lintl \
108+
./configure --disable-cifs-idmap-plugin \
109+
--disable-linux-caps \
110+
--without-selinux \
111+
--without-nfsv4-idmapd-plugin \
112+
--with-smb-idmap-interface-version=6 \
113+
--with-xml-catalog-path=/usr/local/share/xml/catalog
114+
echo "::endgroup::"
115+
116+
echo "::group::Building"
117+
gmake
118+
echo "::endgroup::"
119+
120+
echo "::group::Testing"
121+
# Tests don't work yet
122+
#gmake check
123+
echo "::endgroup::"

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ jobs:
6363
matrix: ${{ steps.matrix.outputs.matrix }}
6464
steps:
6565
- name: Checkout sources
66+
<<<<<<< HEAD
6667
uses: actions/checkout@v3
68+
=======
69+
uses: actions/checkout@v6
70+
>>>>>>> 4d68ca714 (ci: bump actions/checkout from 4 to 6)
6771

6872
- name: Get matrix
6973
id: matrix
@@ -80,7 +84,11 @@ jobs:
8084
contents: read
8185
steps:
8286
- name: Checkout repository
87+
<<<<<<< HEAD
8388
uses: actions/checkout@v3
89+
=======
90+
uses: actions/checkout@v6
91+
>>>>>>> 4d68ca714 (ci: bump actions/checkout from 4 to 6)
8492
with:
8593
path: sssd
8694

@@ -149,7 +157,11 @@ jobs:
149157
python-version: 3.11
150158

151159
- name: Checkout sssd repository
160+
<<<<<<< HEAD
152161
uses: actions/checkout@v3
162+
=======
163+
uses: actions/checkout@v6
164+
>>>>>>> 4d68ca714 (ci: bump actions/checkout from 4 to 6)
153165
with:
154166
path: sssd
155167

‎.github/workflows/coverity.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,23 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout repository
16+
<<<<<<< HEAD
1617
uses: actions/checkout@v3
18+
=======
19+
uses: actions/checkout@v6
20+
with:
21+
ref: ${{ github.event.pull_request.head.sha }}
22+
persist-credentials: false
23+
24+
- name: Set description
25+
run: |
26+
if [ ${{ github.event_name }} == 'pull_request_target' ]; then
27+
echo "DESCRIPTION=Pull Request number ${{ github.event.pull_request.number }}" >> $GITHUB_ENV
28+
else
29+
echo "DESCRIPTION=Daily scheduled run ${{ github.ref }}" >> $GITHUB_ENV
30+
fi
31+
shell: bash
32+
>>>>>>> 4d68ca714 (ci: bump actions/checkout from 4 to 6)
1733

1834
- name: Install dependencies
1935
uses: ./.github/actions/install-dependencies

‎.github/workflows/release.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: "release"
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
branch:
6+
description: 'Target branch for release'
7+
required: true
8+
default: 'master'
9+
type: string
10+
version:
11+
description: 'Release version'
12+
required: true
13+
type: string
14+
jobs:
15+
release:
16+
runs-on: ubuntu-latest
17+
container: quay.io/sssd/ci-client-devel:latest
18+
permissions:
19+
contents: write
20+
pull-requests: read
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v6
24+
with:
25+
path: sssd
26+
27+
- name: Import GPG key
28+
uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec
29+
with:
30+
gpg_private_key: ${{ secrets.GPG_KEY }}
31+
passphrase: ${{ secrets.GPG_PASSPHRASE }}
32+
git_config_global: true
33+
git_user_signingkey: true
34+
git_tag_gpgsign: true
35+
git_commit_gpgsign: true
36+
git_committer_name: sssd-bot
37+
git_committer_email: sssd-maintainers@lists.fedoraproject.org
38+
39+
- name: Install dependencies
40+
uses: ./sssd/.github/actions/install-dependencies
41+
with:
42+
working-directory: sssd
43+
44+
- name: Execute release script
45+
working-directory: sssd
46+
shell: bash
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49+
run: |
50+
./scripts/release.sh "${{ inputs.branch }}" "${{ inputs.version }}"

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ jobs:
1717
security-events: write
1818
steps:
1919
- name: Checkout repository
20+
<<<<<<< HEAD
2021
uses: actions/checkout@v3
22+
=======
23+
uses: actions/checkout@v6
24+
>>>>>>> 4d68ca714 (ci: bump actions/checkout from 4 to 6)
2125

2226
- name: Install dependencies
2327
id: dependencies
@@ -61,7 +65,11 @@ jobs:
6165
python-version: 3.11
6266

6367
- name: Checkout repository
68+
<<<<<<< HEAD
6469
uses: actions/checkout@v3
70+
=======
71+
uses: actions/checkout@v6
72+
>>>>>>> 4d68ca714 (ci: bump actions/checkout from 4 to 6)
6573

6674
- name: Setup virtual environment
6775
working-directory: ./src/tests/system
@@ -108,6 +116,19 @@ jobs:
108116
runs-on: ubuntu-latest
109117
needs: [codeql]
110118
steps:
119+
<<<<<<< HEAD
111120
- name: Fail on failure
112121
if: ${{ needs.codeql.result != 'success' }}
113122
run: exit 1
123+
=======
124+
- name: Setup Python
125+
uses: actions/setup-python@v6
126+
with:
127+
python-version: 3.x
128+
129+
- name: Checkout repository
130+
uses: actions/checkout@v6
131+
132+
- name: Run pre-commit checks
133+
uses: pre-commit/action@v3.0.1
134+
>>>>>>> 4d68ca714 (ci: bump actions/checkout from 4 to 6)

0 commit comments

Comments
 (0)