From fd575d1d95056c3765cfb13c654504502f9ad503 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Mon, 30 Sep 2024 17:38:06 +0200 Subject: [PATCH] chore: Update smb-kerberos workflow --- .github/workflows/smb-kerberos.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml index 51e5fe30c104c..14c745478547b 100644 --- a/.github/workflows/smb-kerberos.yml +++ b/.github/workflows/smb-kerberos.yml @@ -1,20 +1,17 @@ name: Samba Kerberos SSO on: - push: - branches: - - master - - stable* - paths: - - 'apps/files_external/**' - - '.github/workflows/smb-kerberos.yml' pull_request: paths: - 'apps/files_external/**' - '.github/workflows/smb-kerberos.yml' +concurrency: + group: smb-kerberos-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: smb-kerberos-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: ${{ github.repository_owner != 'nextcloud-gmbh' }} @@ -22,15 +19,14 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: submodules: true - name: Checkout user_saml - uses: actions/checkout@v3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: nextcloud/user_saml path: apps/user_saml - ref: stable-5.2 - name: Pull images run: | docker pull ghcr.io/icewind1991/samba-krb-test-dc @@ -42,6 +38,7 @@ jobs: - name: Setup AD-DC run: | DC_IP=$(apps/files_external/tests/sso-setup/start-dc.sh) + sleep 1 apps/files_external/tests/sso-setup/start-apache.sh $DC_IP $PWD echo "DC_IP=$DC_IP" >> $GITHUB_ENV - name: Set up Nextcloud