From 68a0684569c1718c26922e0e6069e1f15477a5c0 Mon Sep 17 00:00:00 2001 From: Jens L Date: Wed, 8 Dec 2021 21:00:58 +0100 Subject: [PATCH] ci: fix test-migrations-from-stable (#1898) * ci: copy files instead of checking out * ci: add marks for prs --- .github/workflows/ci-main.yml | 14 +++++++++++--- .github/workflows/ci-outpost.yml | 8 +++++++- .github/workflows/ci-web.yml | 8 +++++++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index baf0430c9..9c39e771f 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -89,9 +89,11 @@ jobs: run: | # Copy current, latest config to local cp authentik/lib/default.yml local.env.yml + cp -R .github .. + cp -R scripts .. git checkout $(git describe --abbrev=0 --match 'version/*') - git checkout $GITHUB_HEAD_REF -- .github - git checkout $GITHUB_HEAD_REF -- scripts + rm -rf .github/ scripts/ + mv ../.github ../scripts . - name: prepare env: INSTALL: ${{ steps.cache-pipenv.outputs.cache-hit }} @@ -105,6 +107,7 @@ jobs: run: | set -x git fetch + git reset --hard HEAD git checkout $GITHUB_HEAD_REF pipenv sync --dev - name: prepare @@ -220,7 +223,7 @@ jobs: testspace [e2e]unittest.xml --link=codecov - if: ${{ always() }} uses: codecov/codecov-action@v2 - build: + ci-core-mark: needs: - lint - test-migrations @@ -229,6 +232,11 @@ jobs: - test-integration - test-e2e runs-on: ubuntu-latest + steps: + - run: echo mark + build: + needs: ci-core-mark + runs-on: ubuntu-latest timeout-minutes: 120 strategy: fail-fast: false diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml index 0e3e26531..7f47039e6 100644 --- a/.github/workflows/ci-outpost.yml +++ b/.github/workflows/ci-outpost.yml @@ -30,10 +30,16 @@ jobs: -w /app \ golangci/golangci-lint:v1.39.0 \ golangci-lint run -v --timeout 200s + ci-outpost-mark: + needs: + - lint-golint + runs-on: ubuntu-latest + steps: + - run: echo mark build: timeout-minutes: 120 needs: - - lint-golint + - ci-outpost-mark strategy: fail-fast: false matrix: diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml index c52e56270..63043c00c 100644 --- a/.github/workflows/ci-web.yml +++ b/.github/workflows/ci-web.yml @@ -65,12 +65,18 @@ jobs: run: | cd web npm run lit-analyse - build: + ci-web-mark: needs: - lint-eslint - lint-prettier - lint-lit-analyse runs-on: ubuntu-latest + steps: + - run: echo mark + build: + needs: + - ci-web-mark + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v2