From e6b84f91916f91adfa136277a1e4b2beb6af01ba Mon Sep 17 00:00:00 2001 From: Otto Richter Date: Mon, 30 Sep 2024 02:06:28 +0200 Subject: [PATCH] ci: move composite workflow location otherwise, they unfortunately display in the Forgejo UI with an error message --- .../apt-install-from/action.yaml | 0 .../build-backend/action.yaml | 0 .../setup-env/action.yaml | 0 .forgejo/workflows/testing.yml | 36 +++++++++---------- 4 files changed, 18 insertions(+), 18 deletions(-) rename .forgejo/{workflows/composite => workflows-composite}/apt-install-from/action.yaml (100%) rename .forgejo/{workflows/composite => workflows-composite}/build-backend/action.yaml (100%) rename .forgejo/{workflows/composite => workflows-composite}/setup-env/action.yaml (100%) diff --git a/.forgejo/workflows/composite/apt-install-from/action.yaml b/.forgejo/workflows-composite/apt-install-from/action.yaml similarity index 100% rename from .forgejo/workflows/composite/apt-install-from/action.yaml rename to .forgejo/workflows-composite/apt-install-from/action.yaml diff --git a/.forgejo/workflows/composite/build-backend/action.yaml b/.forgejo/workflows-composite/build-backend/action.yaml similarity index 100% rename from .forgejo/workflows/composite/build-backend/action.yaml rename to .forgejo/workflows-composite/build-backend/action.yaml diff --git a/.forgejo/workflows/composite/setup-env/action.yaml b/.forgejo/workflows-composite/setup-env/action.yaml similarity index 100% rename from .forgejo/workflows/composite/setup-env/action.yaml rename to .forgejo/workflows-composite/setup-env/action.yaml diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index 56f2de5136..960f3d716e 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -20,10 +20,10 @@ jobs: ${{ toJSON(github) }} EOF - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows/composite/setup-env + - uses: ./.forgejo/workflows-composite/setup-env - run: su forgejo -c 'make deps-backend deps-tools' - run: su forgejo -c 'make --always-make -j$(nproc) lint-backend tidy-check swagger-check fmt-check swagger-validate' # ensure the "go-licenses" make target runs - - uses: ./.forgejo/workflows/composite/build-backend + - uses: ./.forgejo/workflows-composite/build-backend frontend-checks: if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker @@ -58,16 +58,16 @@ jobs: MINIO_ROOT_PASSWORD: 12345678 steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows/composite/setup-env + - uses: ./.forgejo/workflows-composite/setup-env - name: install git >= 2.42 - uses: ./.forgejo/workflows/composite/apt-install-from + uses: ./.forgejo/workflows-composite/apt-install-from with: packages: git - name: test release-notes-assistant.sh run: | apt-get -q install -qq -y jq ./release-notes-assistant.sh test_main - - uses: ./.forgejo/workflows/composite/build-backend + - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-backend test-check' timeout-minutes: 50 @@ -102,12 +102,12 @@ jobs: options: ${{ matrix.cacher.options }} steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows/composite/setup-env + - uses: ./.forgejo/workflows-composite/setup-env - name: install git >= 2.42 - uses: ./.forgejo/workflows/composite/apt-install-from + uses: ./.forgejo/workflows-composite/apt-install-from with: packages: git - - uses: ./.forgejo/workflows/composite/build-backend + - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-remote-cacher test-check' timeout-minutes: 50 @@ -133,12 +133,12 @@ jobs: MYSQL_EXTRA_FLAGS: --innodb-adaptive-flushing=OFF --innodb-buffer-pool-size=4G --innodb-log-buffer-size=128M --innodb-flush-log-at-trx-commit=0 --innodb-flush-log-at-timeout=30 --innodb-flush-method=nosync --innodb-fsync-threshold=1000000000 steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows/composite/setup-env + - uses: ./.forgejo/workflows-composite/setup-env - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows/composite/apt-install-from + uses: ./.forgejo/workflows-composite/apt-install-from with: packages: git git-lfs - - uses: ./.forgejo/workflows/composite/build-backend + - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-mysql-migration test-mysql' timeout-minutes: 50 @@ -165,12 +165,12 @@ jobs: POSTGRES_PASSWORD: postgres steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows/composite/setup-env + - uses: ./.forgejo/workflows-composite/setup-env - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows/composite/apt-install-from + uses: ./.forgejo/workflows-composite/apt-install-from with: packages: git git-lfs - - uses: ./.forgejo/workflows/composite/build-backend + - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-pgsql-migration test-pgsql' timeout-minutes: 50 @@ -186,12 +186,12 @@ jobs: image: 'code.forgejo.org/oci/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows/composite/setup-env + - uses: ./.forgejo/workflows-composite/setup-env - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows/composite/apt-install-from + uses: ./.forgejo/workflows-composite/apt-install-from with: packages: git git-lfs - - uses: ./.forgejo/workflows/composite/build-backend + - uses: ./.forgejo/workflows-composite/build-backend - run: | su forgejo -c 'make test-sqlite-migration test-sqlite' timeout-minutes: 50 @@ -213,6 +213,6 @@ jobs: image: 'code.forgejo.org/oci/node:20-bookworm' steps: - uses: https://code.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows/composite/setup-env + - uses: ./.forgejo/workflows-composite/setup-env - run: su forgejo -c 'make deps-backend deps-tools' - run: su forgejo -c 'make security-check'