diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f95e9ca..ede7d96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,12 +6,7 @@ on: ref: description: Branch or tag to checkout required: false - default: teaser-2026 - type: string - runner: - description: Runner label to use for the build - required: false - default: prox-1 + default: development type: string secrets: USER_AUTH: @@ -19,7 +14,7 @@ on: jobs: build: - runs-on: ${{ inputs.runner }} + runs-on: prox-2 steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9bfc7a3..cfe5f8a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,19 +2,13 @@ name: deploy on: workflow_call: - inputs: - runner: - description: Runner label to use for the deploy - required: false - default: prox-1 - type: string secrets: USER_AUTH: required: true jobs: deploy: - runs-on: ${{ inputs.runner }} + runs-on: prox-2 steps: - name: Restart NextJS service env: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a66be7..efdf567 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,49 +3,17 @@ name: main on: push: branches: - - teaser-2026 - development workflow_dispatch: - inputs: - ref: - description: Branch or tag to build and deploy - required: false - default: teaser-2026 - type: string jobs: - build_teaser: - if: ${{ (github.event.inputs.ref || github.ref_name) == 'teaser-2026' }} + build: uses: ./.github/workflows/build.yml - with: - ref: ${{ github.event.inputs.ref || github.ref_name }} - runner: prox-1 secrets: USER_AUTH: ${{ secrets.USER_AUTH }} - deploy_teaser: - if: ${{ (github.event.inputs.ref || github.ref_name) == 'teaser-2026' }} - needs: build_teaser + deploy: + needs: build uses: ./.github/workflows/deploy.yml - with: - runner: prox-1 - secrets: - USER_AUTH: ${{ secrets.USER_AUTH }} - - build_dev: - if: ${{ (github.event.inputs.ref || github.ref_name) == 'development' }} - uses: ./.github/workflows/build.yml - with: - ref: ${{ github.event.inputs.ref || github.ref_name }} - runner: prox-2 - secrets: - USER_AUTH: ${{ secrets.USER_AUTH }} - - deploy_dev: - if: ${{ (github.event.inputs.ref || github.ref_name) == 'development' }} - needs: build_dev - uses: ./.github/workflows/deploy.yml - with: - runner: prox-2 secrets: USER_AUTH: ${{ secrets.USER_AUTH }}