From fa29727b53df6d23094318e2dc72a33af056eeab Mon Sep 17 00:00:00 2001 From: Maxime Perrault Date: Thu, 11 Jul 2024 17:30:51 +0200 Subject: [PATCH] Revert "fix: add self-hosted runners" This reverts commit d7b7546251d1c4f21d17d4a73ef75d5dc2de28fd. --- .github/workflows/cicd-app.yml | 28 ++++++++++++------------- .github/workflows/cicd-database.yml | 2 +- .github/workflows/cicd-datapipeline.yml | 2 +- .github/workflows/publish-package.yml | 5 +++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cicd-app.yml b/.github/workflows/cicd-app.yml index ca51415d6f..bc04518412 100644 --- a/.github/workflows/cicd-app.yml +++ b/.github/workflows/cicd-app.yml @@ -17,7 +17,7 @@ on: jobs: version: name: Set application version and env profile - runs-on: [ ubuntu-22.04, self-hosted ] + runs-on: ubuntu-22.04 outputs: ENV_PROFILE: ${{ steps.env_profile.outputs.ENV_PROFILE }} VERSION: ${{ steps.version.outputs.VERSION }} @@ -59,7 +59,7 @@ jobs: unit_test_backend: name: Run backend unit tests needs: version - runs-on: [ ubuntu-22.04, self-hosted ] + runs-on: ubuntu-22.04 env: ENV_PROFILE: ${{needs.version.outputs.ENV_PROFILE}} VERSION: ${{needs.version.outputs.VERSION}} @@ -84,7 +84,7 @@ jobs: unit_test_frontend: name: Run frontend unit tests needs: version - runs-on: [ ubuntu-22.04, self-hosted ] + runs-on: ubuntu-22.04 env: PUPPETEER_SKIP_DOWNLOAD: "true" steps: @@ -121,7 +121,7 @@ jobs: build: name: Build and package needs: version - runs-on: [ ubuntu-22.04, self-hosted ] + runs-on: ubuntu-22.04 env: ENV_PROFILE: ${{needs.version.outputs.ENV_PROFILE}} VERSION: ${{needs.version.outputs.VERSION}} @@ -176,8 +176,8 @@ jobs: e2e_test: name: Run E2E tests - needs: [ version, build ] - runs-on: [ ubuntu-22.04, self-hosted ] + needs: [version, build] + runs-on: ubuntu-22.04 strategy: # when one test fails, DO NOT cancel the other # containers, because this will kill Cypress processes @@ -185,7 +185,7 @@ jobs: # https://github.com/cypress-io/github-action/issues/48 fail-fast: false matrix: - containers: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 ] + containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true CYPRESS_PROJECT_ID: ${{ secrets.CYPRESS_PROJECT_ID }} @@ -239,15 +239,15 @@ jobs: record: true wait-on: "http://localhost:8880" working-directory: ./frontend - + - name: Display Docker container logs for debugging if: failure() run: docker logs monitorenv_backend e2e_multi_windows_test: name: Run E2E multi windows tests - needs: [ version, build ] - runs-on: [ ubuntu-22.04, self-hosted ] + needs: [version, build] + runs-on: ubuntu-22.04 if: false env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true @@ -295,8 +295,8 @@ jobs: generate_and_upload_source_maps: name: Generate and upload source maps to Sentry - needs: [ version, build, unit_test_backend, unit_test_frontend, e2e_test ] - runs-on: [ ubuntu-22.04, self-hosted ] + needs: [version, build, unit_test_backend, unit_test_frontend, e2e_test] + runs-on: ubuntu-22.04 env: VERSION: ${{ needs.version.outputs.VERSION }} SENTRY_URL: ${{ secrets.SENTRY_URL }} @@ -336,9 +336,9 @@ jobs: push_to_registry: name: Push to registry - needs: [ version, unit_test_backend, unit_test_frontend, e2e_test, generate_and_upload_source_maps ] + needs: [version, unit_test_backend, unit_test_frontend, e2e_test, generate_and_upload_source_maps] # needs: [version, e2e_test, e2e_multi_windows_test, unit_test_frontend, e2e_test] - runs-on: [ ubuntu-22.04, self-hosted ] + runs-on: ubuntu-22.04 if: startsWith(github.ref, 'refs/heads/dependabot') == false env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true diff --git a/.github/workflows/cicd-database.yml b/.github/workflows/cicd-database.yml index 1806617c17..df7b55b421 100644 --- a/.github/workflows/cicd-database.yml +++ b/.github/workflows/cicd-database.yml @@ -9,7 +9,7 @@ on: jobs: build: name: Build database image - runs-on: [ ubuntu-22.04, self-hosted ] + runs-on: ubuntu-22.04 permissions: contents: read packages: write diff --git a/.github/workflows/cicd-datapipeline.yml b/.github/workflows/cicd-datapipeline.yml index 1d4dc0240a..5e792ef842 100644 --- a/.github/workflows/cicd-datapipeline.yml +++ b/.github/workflows/cicd-datapipeline.yml @@ -16,7 +16,7 @@ on: jobs: build: name: Build & test docker image - runs-on: [ ubuntu-22.04, self-hosted ] + runs-on: ubuntu-22.04 permissions: contents: read packages: write diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index 0ef54cb1cc..27edfe17f2 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -1,3 +1,4 @@ + name: Publish monitor public API to GitHub Packages on: workflow_dispatch: @@ -7,7 +8,7 @@ on: default: 'v1.0.0' jobs: publish: - runs-on: [ ubuntu-22.04, self-hosted ] + runs-on: ubuntu-latest permissions: contents: read packages: write @@ -20,7 +21,7 @@ jobs: - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v3 - name: Replace the version number - run: sed -i -e "s/VERSION_TO_CHANGE/${{ github.event.inputs.version }}/g" backend/build.gradle.kts + run: sed -i -e "s/VERSION_TO_CHANGE/${{ github.event.inputs.version }}/g" backend/build.gradle.kts - name: Publish package uses: gradle/gradle-build-action@v3 with: