From e2b5c0073c3c49ae366fb441b6990338fdb07049 Mon Sep 17 00:00:00 2001 From: Sondre Lefsaker Date: Tue, 5 Sep 2023 12:24:18 +0200 Subject: [PATCH 1/5] Revert "use correct event name" This reverts commit 2ddbfcbbe614caf31da93022761eb65be884c1c1. --- .github/workflows/kafka-manager.yaml | 2 +- .github/workflows/kafka-topics-dev.yaml | 2 +- .github/workflows/kafka-topics-prod.yaml | 2 +- .github/workflows/mr-admin-flate-container.yaml | 2 +- .github/workflows/mr-admin-flate.yaml | 2 +- .github/workflows/mr-api-alerts.yaml | 2 +- .github/workflows/mr-api.yaml | 2 +- .github/workflows/mr-arena-adapter-alerts.yaml | 2 +- .github/workflows/mr-arena-adapter-manager-container.yaml | 2 +- .github/workflows/mr-arena-adapter-manager.yaml | 2 +- .github/workflows/mr-arena-adapter.yaml | 2 +- .github/workflows/mr-sanity-studio.yaml | 2 +- .github/workflows/mr-veileder-flate-container.yaml | 2 +- .github/workflows/mr-veileder-flate.yaml | 2 +- .github/workflows/unleash-apitoken.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/kafka-manager.yaml b/.github/workflows/kafka-manager.yaml index 9c3c8df841..eb67b072fe 100644 --- a/.github/workflows/kafka-manager.yaml +++ b/.github/workflows/kafka-manager.yaml @@ -1,7 +1,7 @@ name: Kafka manager on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/kafka-manager.yaml diff --git a/.github/workflows/kafka-topics-dev.yaml b/.github/workflows/kafka-topics-dev.yaml index 3a1a1c745b..ac3fe684e7 100644 --- a/.github/workflows/kafka-topics-dev.yaml +++ b/.github/workflows/kafka-topics-dev.yaml @@ -1,7 +1,7 @@ name: Deploy kafka topics to dev on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/kafka-topics-dev.yaml diff --git a/.github/workflows/kafka-topics-prod.yaml b/.github/workflows/kafka-topics-prod.yaml index c67ea0f80b..df5f87f804 100644 --- a/.github/workflows/kafka-topics-prod.yaml +++ b/.github/workflows/kafka-topics-prod.yaml @@ -1,7 +1,7 @@ name: Deploy kafka topics to prod on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/kafka-topics-prod.yaml diff --git a/.github/workflows/mr-admin-flate-container.yaml b/.github/workflows/mr-admin-flate-container.yaml index e67005be45..80b4d81b19 100644 --- a/.github/workflows/mr-admin-flate-container.yaml +++ b/.github/workflows/mr-admin-flate-container.yaml @@ -1,7 +1,7 @@ name: POAO-frontend (mr-admin-flate) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-admin-flate-container.yaml diff --git a/.github/workflows/mr-admin-flate.yaml b/.github/workflows/mr-admin-flate.yaml index 5e34dad6c0..0b9a75d148 100644 --- a/.github/workflows/mr-admin-flate.yaml +++ b/.github/workflows/mr-admin-flate.yaml @@ -1,7 +1,7 @@ name: CI/CD (mr-admin-flate) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-admin-flate.yaml diff --git a/.github/workflows/mr-api-alerts.yaml b/.github/workflows/mr-api-alerts.yaml index 23a9c22eab..bad6057fad 100644 --- a/.github/workflows/mr-api-alerts.yaml +++ b/.github/workflows/mr-api-alerts.yaml @@ -1,7 +1,7 @@ name: Alerts (mr-api) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-api-alerts.yaml diff --git a/.github/workflows/mr-api.yaml b/.github/workflows/mr-api.yaml index 4e70b46e2b..549c4fcd12 100644 --- a/.github/workflows/mr-api.yaml +++ b/.github/workflows/mr-api.yaml @@ -1,7 +1,7 @@ name: CI/CD (mr-api) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-api.yaml diff --git a/.github/workflows/mr-arena-adapter-alerts.yaml b/.github/workflows/mr-arena-adapter-alerts.yaml index 01ec1e0671..d4757669b0 100644 --- a/.github/workflows/mr-arena-adapter-alerts.yaml +++ b/.github/workflows/mr-arena-adapter-alerts.yaml @@ -1,7 +1,7 @@ name: Alerts (mr-arena-adapter) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-arena-adapter-alerts.yaml diff --git a/.github/workflows/mr-arena-adapter-manager-container.yaml b/.github/workflows/mr-arena-adapter-manager-container.yaml index b906353d3b..601ac5cb18 100644 --- a/.github/workflows/mr-arena-adapter-manager-container.yaml +++ b/.github/workflows/mr-arena-adapter-manager-container.yaml @@ -1,7 +1,7 @@ name: POAO-frontend (mr-arena-adapter-manager) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-arena-adapter-manager-container.yaml diff --git a/.github/workflows/mr-arena-adapter-manager.yaml b/.github/workflows/mr-arena-adapter-manager.yaml index 670ae323e6..37b555efc2 100644 --- a/.github/workflows/mr-arena-adapter-manager.yaml +++ b/.github/workflows/mr-arena-adapter-manager.yaml @@ -1,7 +1,7 @@ name: CI/CD (mr-arena-adapter-manager) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-arena-adapter-manager.yaml diff --git a/.github/workflows/mr-arena-adapter.yaml b/.github/workflows/mr-arena-adapter.yaml index ef4e2ea7a3..60c4945c13 100644 --- a/.github/workflows/mr-arena-adapter.yaml +++ b/.github/workflows/mr-arena-adapter.yaml @@ -1,7 +1,7 @@ name: CI/CD (mr-arena-adapter) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-arena-adapter.yaml diff --git a/.github/workflows/mr-sanity-studio.yaml b/.github/workflows/mr-sanity-studio.yaml index a59f848cca..d5bf366db9 100644 --- a/.github/workflows/mr-sanity-studio.yaml +++ b/.github/workflows/mr-sanity-studio.yaml @@ -1,7 +1,7 @@ name: Deploy Sanity Studio on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-sanity-studio.yaml diff --git a/.github/workflows/mr-veileder-flate-container.yaml b/.github/workflows/mr-veileder-flate-container.yaml index 2f1414d023..54236036f0 100644 --- a/.github/workflows/mr-veileder-flate-container.yaml +++ b/.github/workflows/mr-veileder-flate-container.yaml @@ -1,7 +1,7 @@ name: POAO-frontend (mr-veileder-flate) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-veileder-flate-container.yaml diff --git a/.github/workflows/mr-veileder-flate.yaml b/.github/workflows/mr-veileder-flate.yaml index 256233afb6..036540fbf2 100644 --- a/.github/workflows/mr-veileder-flate.yaml +++ b/.github/workflows/mr-veileder-flate.yaml @@ -1,7 +1,7 @@ name: CI/CD (mr-veileder-flate) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/mr-veileder-flate.yaml diff --git a/.github/workflows/unleash-apitoken.yaml b/.github/workflows/unleash-apitoken.yaml index 59c7b5b861..b9e3bdc8e2 100644 --- a/.github/workflows/unleash-apitoken.yaml +++ b/.github/workflows/unleash-apitoken.yaml @@ -1,7 +1,7 @@ name: Unleash api-tokens (mr-api) on: - merge_group: + merge_queue: pull_request: paths: - .github/workflows/unleash-apitoken.yaml From a8a084a266550e3ac87bab23fef08cfb629d5c32 Mon Sep 17 00:00:00 2001 From: Sondre Lefsaker Date: Tue, 5 Sep 2023 12:24:51 +0200 Subject: [PATCH 2/5] Revert "replace push-event with merge_queue- and pull_request-events" This reverts commit 5fa74552c5f575d8823c7c626c328a3512415300. --- .github/workflows/kafka-manager.yaml | 3 +-- .github/workflows/kafka-topics-dev.yaml | 3 +-- .github/workflows/kafka-topics-prod.yaml | 3 +-- .github/workflows/mr-admin-flate-container.yaml | 3 +-- .github/workflows/mr-admin-flate.yaml | 3 +-- .github/workflows/mr-api-alerts.yaml | 3 +-- .github/workflows/mr-api.yaml | 3 +-- .github/workflows/mr-arena-adapter-alerts.yaml | 3 +-- .github/workflows/mr-arena-adapter-manager-container.yaml | 3 +-- .github/workflows/mr-arena-adapter-manager.yaml | 3 +-- .github/workflows/mr-arena-adapter.yaml | 3 +-- .github/workflows/mr-sanity-studio.yaml | 3 +-- .github/workflows/mr-veileder-flate-container.yaml | 3 +-- .github/workflows/mr-veileder-flate.yaml | 3 +-- .github/workflows/unleash-apitoken.yaml | 3 +-- 15 files changed, 15 insertions(+), 30 deletions(-) diff --git a/.github/workflows/kafka-manager.yaml b/.github/workflows/kafka-manager.yaml index eb67b072fe..5847cb0081 100644 --- a/.github/workflows/kafka-manager.yaml +++ b/.github/workflows/kafka-manager.yaml @@ -1,8 +1,7 @@ name: Kafka manager on: - merge_queue: - pull_request: + push: paths: - .github/workflows/kafka-manager.yaml - iac/kafka-manager/** diff --git a/.github/workflows/kafka-topics-dev.yaml b/.github/workflows/kafka-topics-dev.yaml index ac3fe684e7..4a443642f7 100644 --- a/.github/workflows/kafka-topics-dev.yaml +++ b/.github/workflows/kafka-topics-dev.yaml @@ -1,8 +1,7 @@ name: Deploy kafka topics to dev on: - merge_queue: - pull_request: + push: paths: - .github/workflows/kafka-topics-dev.yaml - iac/kafka-topics/dev/*.yaml diff --git a/.github/workflows/kafka-topics-prod.yaml b/.github/workflows/kafka-topics-prod.yaml index df5f87f804..ce29a1f2f3 100644 --- a/.github/workflows/kafka-topics-prod.yaml +++ b/.github/workflows/kafka-topics-prod.yaml @@ -1,8 +1,7 @@ name: Deploy kafka topics to prod on: - merge_queue: - pull_request: + push: paths: - .github/workflows/kafka-topics-prod.yaml - iac/kafka-topics/prod/*.yaml diff --git a/.github/workflows/mr-admin-flate-container.yaml b/.github/workflows/mr-admin-flate-container.yaml index 80b4d81b19..c98f3914ca 100644 --- a/.github/workflows/mr-admin-flate-container.yaml +++ b/.github/workflows/mr-admin-flate-container.yaml @@ -1,8 +1,7 @@ name: POAO-frontend (mr-admin-flate) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-admin-flate-container.yaml - frontend/mr-admin-flate/.nais/** diff --git a/.github/workflows/mr-admin-flate.yaml b/.github/workflows/mr-admin-flate.yaml index 0b9a75d148..ad58daf11e 100644 --- a/.github/workflows/mr-admin-flate.yaml +++ b/.github/workflows/mr-admin-flate.yaml @@ -1,8 +1,7 @@ name: CI/CD (mr-admin-flate) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-admin-flate.yaml - package.json diff --git a/.github/workflows/mr-api-alerts.yaml b/.github/workflows/mr-api-alerts.yaml index bad6057fad..63229e0628 100644 --- a/.github/workflows/mr-api-alerts.yaml +++ b/.github/workflows/mr-api-alerts.yaml @@ -1,8 +1,7 @@ name: Alerts (mr-api) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-api-alerts.yaml - mulighetsrommet-api/.nais/alerts.yaml diff --git a/.github/workflows/mr-api.yaml b/.github/workflows/mr-api.yaml index 549c4fcd12..7a27894024 100644 --- a/.github/workflows/mr-api.yaml +++ b/.github/workflows/mr-api.yaml @@ -1,8 +1,7 @@ name: CI/CD (mr-api) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-api.yaml - build.gradle.kts diff --git a/.github/workflows/mr-arena-adapter-alerts.yaml b/.github/workflows/mr-arena-adapter-alerts.yaml index d4757669b0..9e28855837 100644 --- a/.github/workflows/mr-arena-adapter-alerts.yaml +++ b/.github/workflows/mr-arena-adapter-alerts.yaml @@ -1,8 +1,7 @@ name: Alerts (mr-arena-adapter) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-arena-adapter-alerts.yaml - mulighetsrommet-arena-adapter/.nais/alerts.yaml diff --git a/.github/workflows/mr-arena-adapter-manager-container.yaml b/.github/workflows/mr-arena-adapter-manager-container.yaml index 601ac5cb18..4b477760d5 100644 --- a/.github/workflows/mr-arena-adapter-manager-container.yaml +++ b/.github/workflows/mr-arena-adapter-manager-container.yaml @@ -1,8 +1,7 @@ name: POAO-frontend (mr-arena-adapter-manager) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-arena-adapter-manager-container.yaml - frontend/arena-adapter-manager/.nais/** diff --git a/.github/workflows/mr-arena-adapter-manager.yaml b/.github/workflows/mr-arena-adapter-manager.yaml index 37b555efc2..7835d1b83c 100644 --- a/.github/workflows/mr-arena-adapter-manager.yaml +++ b/.github/workflows/mr-arena-adapter-manager.yaml @@ -1,8 +1,7 @@ name: CI/CD (mr-arena-adapter-manager) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-arena-adapter-manager.yaml - package.json diff --git a/.github/workflows/mr-arena-adapter.yaml b/.github/workflows/mr-arena-adapter.yaml index 60c4945c13..44328a2585 100644 --- a/.github/workflows/mr-arena-adapter.yaml +++ b/.github/workflows/mr-arena-adapter.yaml @@ -1,8 +1,7 @@ name: CI/CD (mr-arena-adapter) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-arena-adapter.yaml - build.gradle.kts diff --git a/.github/workflows/mr-sanity-studio.yaml b/.github/workflows/mr-sanity-studio.yaml index d5bf366db9..c3c5b68e17 100644 --- a/.github/workflows/mr-sanity-studio.yaml +++ b/.github/workflows/mr-sanity-studio.yaml @@ -1,8 +1,7 @@ name: Deploy Sanity Studio on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-sanity-studio.yaml - package.json diff --git a/.github/workflows/mr-veileder-flate-container.yaml b/.github/workflows/mr-veileder-flate-container.yaml index 54236036f0..88301f1049 100644 --- a/.github/workflows/mr-veileder-flate-container.yaml +++ b/.github/workflows/mr-veileder-flate-container.yaml @@ -1,8 +1,7 @@ name: POAO-frontend (mr-veileder-flate) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-veileder-flate-container.yaml - frontend/mulighetsrommet-veileder-flate/.nais/** diff --git a/.github/workflows/mr-veileder-flate.yaml b/.github/workflows/mr-veileder-flate.yaml index 036540fbf2..6d6f47a53a 100644 --- a/.github/workflows/mr-veileder-flate.yaml +++ b/.github/workflows/mr-veileder-flate.yaml @@ -1,8 +1,7 @@ name: CI/CD (mr-veileder-flate) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/mr-veileder-flate.yaml - package.json diff --git a/.github/workflows/unleash-apitoken.yaml b/.github/workflows/unleash-apitoken.yaml index b9e3bdc8e2..188dc01557 100644 --- a/.github/workflows/unleash-apitoken.yaml +++ b/.github/workflows/unleash-apitoken.yaml @@ -1,8 +1,7 @@ name: Unleash api-tokens (mr-api) on: - merge_queue: - pull_request: + push: paths: - .github/workflows/unleash-apitoken.yaml - mulighetsrommet-api/.nais/unleash-apitoken-dev.yaml From 907cd9c48f485e9fbf4d955263e4cb78e704ee2e Mon Sep 17 00:00:00 2001 From: Sondre Lefsaker Date: Tue, 5 Sep 2023 12:26:59 +0200 Subject: [PATCH 3/5] Revert "use paths filter for both pull_request- and push-event" This reverts commit 64a08fc6698b11f1be99fcad099c89639cb0a62c. --- .github/workflows/kafka-manager.yaml | 3 --- .github/workflows/kafka-topics-dev.yaml | 3 --- .github/workflows/kafka-topics-prod.yaml | 3 --- .github/workflows/mr-admin-flate-container.yaml | 3 --- .github/workflows/mr-admin-flate.yaml | 7 ------- .github/workflows/mr-api-alerts.yaml | 3 --- .github/workflows/mr-api.yaml | 8 -------- .github/workflows/mr-arena-adapter-alerts.yaml | 3 --- .github/workflows/mr-arena-adapter-manager-container.yaml | 3 --- .github/workflows/mr-arena-adapter-manager.yaml | 6 ------ .github/workflows/mr-arena-adapter.yaml | 8 -------- .github/workflows/mr-sanity-studio.yaml | 6 ------ .github/workflows/mr-veileder-flate-container.yaml | 3 --- .github/workflows/mr-veileder-flate.yaml | 7 ------- .github/workflows/unleash-apitoken.yaml | 4 ---- 15 files changed, 70 deletions(-) diff --git a/.github/workflows/kafka-manager.yaml b/.github/workflows/kafka-manager.yaml index 5847cb0081..3477103985 100644 --- a/.github/workflows/kafka-manager.yaml +++ b/.github/workflows/kafka-manager.yaml @@ -8,9 +8,6 @@ on: push: branches: - main - paths: - - .github/workflows/kafka-manager.yaml - - iac/kafka-manager/** jobs: ci: diff --git a/.github/workflows/kafka-topics-dev.yaml b/.github/workflows/kafka-topics-dev.yaml index 4a443642f7..6fb936adbc 100644 --- a/.github/workflows/kafka-topics-dev.yaml +++ b/.github/workflows/kafka-topics-dev.yaml @@ -8,9 +8,6 @@ on: push: branches: - main - paths: - - .github/workflows/kafka-topics-dev.yaml - - iac/kafka-topics/dev/*.yaml jobs: ci: diff --git a/.github/workflows/kafka-topics-prod.yaml b/.github/workflows/kafka-topics-prod.yaml index ce29a1f2f3..3b0ce0eb8c 100644 --- a/.github/workflows/kafka-topics-prod.yaml +++ b/.github/workflows/kafka-topics-prod.yaml @@ -8,9 +8,6 @@ on: push: branches: - main - paths: - - .github/workflows/kafka-topics-prod.yaml - - iac/kafka-topics/prod/*.yaml jobs: ci: diff --git a/.github/workflows/mr-admin-flate-container.yaml b/.github/workflows/mr-admin-flate-container.yaml index c98f3914ca..baa3c6a774 100644 --- a/.github/workflows/mr-admin-flate-container.yaml +++ b/.github/workflows/mr-admin-flate-container.yaml @@ -8,9 +8,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-admin-flate-container.yaml - - frontend/mr-admin-flate/.nais/** workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-admin-flate.yaml b/.github/workflows/mr-admin-flate.yaml index ad58daf11e..b05874afff 100644 --- a/.github/workflows/mr-admin-flate.yaml +++ b/.github/workflows/mr-admin-flate.yaml @@ -12,13 +12,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-admin-flate.yaml - - package.json - - package-lock.json - - turbo.json - - frontend/mr-admin-flate/** - - mulighetsrommet-api/src/main/resources/web/openapi.yaml workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-api-alerts.yaml b/.github/workflows/mr-api-alerts.yaml index 63229e0628..3f77adc558 100644 --- a/.github/workflows/mr-api-alerts.yaml +++ b/.github/workflows/mr-api-alerts.yaml @@ -8,9 +8,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-api-alerts.yaml - - mulighetsrommet-api/.nais/alerts.yaml jobs: ci: diff --git a/.github/workflows/mr-api.yaml b/.github/workflows/mr-api.yaml index 7a27894024..9b713f4fbf 100644 --- a/.github/workflows/mr-api.yaml +++ b/.github/workflows/mr-api.yaml @@ -13,14 +13,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-api.yaml - - build.gradle.kts - - settings.gradle.kts - - gradle.properties - - gradle/libs.versions.toml - - common/** - - mulighetsrommet-api/** workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-arena-adapter-alerts.yaml b/.github/workflows/mr-arena-adapter-alerts.yaml index 9e28855837..f1d0f1fba4 100644 --- a/.github/workflows/mr-arena-adapter-alerts.yaml +++ b/.github/workflows/mr-arena-adapter-alerts.yaml @@ -8,9 +8,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-arena-adapter-alerts.yaml - - mulighetsrommet-arena-adapter/.nais/alerts.yaml jobs: ci: diff --git a/.github/workflows/mr-arena-adapter-manager-container.yaml b/.github/workflows/mr-arena-adapter-manager-container.yaml index 4b477760d5..22867e6d81 100644 --- a/.github/workflows/mr-arena-adapter-manager-container.yaml +++ b/.github/workflows/mr-arena-adapter-manager-container.yaml @@ -8,9 +8,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-arena-adapter-manager-container.yaml - - frontend/arena-adapter-manager/.nais/** workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-arena-adapter-manager.yaml b/.github/workflows/mr-arena-adapter-manager.yaml index 7835d1b83c..44e696c71e 100644 --- a/.github/workflows/mr-arena-adapter-manager.yaml +++ b/.github/workflows/mr-arena-adapter-manager.yaml @@ -11,12 +11,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-arena-adapter-manager.yaml - - package.json - - package-lock.json - - turbo.json - - frontend/arena-adapter-manager/** workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-arena-adapter.yaml b/.github/workflows/mr-arena-adapter.yaml index 44328a2585..30e09a3281 100644 --- a/.github/workflows/mr-arena-adapter.yaml +++ b/.github/workflows/mr-arena-adapter.yaml @@ -13,14 +13,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-arena-adapter.yaml - - build.gradle.kts - - settings.gradle.kts - - gradle.properties - - gradle/libs.versions.toml - - common/** - - mulighetsrommet-arena-adapter/** workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-sanity-studio.yaml b/.github/workflows/mr-sanity-studio.yaml index c3c5b68e17..f20cf90f37 100644 --- a/.github/workflows/mr-sanity-studio.yaml +++ b/.github/workflows/mr-sanity-studio.yaml @@ -11,12 +11,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-sanity-studio.yaml - - package.json - - package-lock.json - - turbo.json - - frontend/mulighetsrommet-cms/** workflow_dispatch: concurrency: diff --git a/.github/workflows/mr-veileder-flate-container.yaml b/.github/workflows/mr-veileder-flate-container.yaml index 88301f1049..db1a0624ac 100644 --- a/.github/workflows/mr-veileder-flate-container.yaml +++ b/.github/workflows/mr-veileder-flate-container.yaml @@ -8,9 +8,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-veileder-flate-container.yaml - - frontend/mulighetsrommet-veileder-flate/.nais/** workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-veileder-flate.yaml b/.github/workflows/mr-veileder-flate.yaml index 6d6f47a53a..0cf5583783 100644 --- a/.github/workflows/mr-veileder-flate.yaml +++ b/.github/workflows/mr-veileder-flate.yaml @@ -12,13 +12,6 @@ on: push: branches: - main - paths: - - .github/workflows/mr-veileder-flate.yaml - - package.json - - package-lock.json - - turbo.json - - frontend/mulighetsrommet-veileder-flate/** - - mulighetsrommet-api/src/main/resources/web/openapi.yaml workflow_dispatch: inputs: environment: diff --git a/.github/workflows/unleash-apitoken.yaml b/.github/workflows/unleash-apitoken.yaml index 188dc01557..c241ec7e5b 100644 --- a/.github/workflows/unleash-apitoken.yaml +++ b/.github/workflows/unleash-apitoken.yaml @@ -9,10 +9,6 @@ on: push: branches: - main - paths: - - .github/workflows/unleash-apitoken.yaml - - mulighetsrommet-api/.nais/unleash-apitoken-dev.yaml - - mulighetsrommet-api/.nais/unleash-apitoken-prod.yaml jobs: ci: From 639d74648b9f58e48e18c1d70f41beea8887dcae Mon Sep 17 00:00:00 2001 From: Sondre Lefsaker Date: Tue, 5 Sep 2023 12:27:32 +0200 Subject: [PATCH 4/5] Revert "trigger the remaining workflows on push to main" This reverts commit f5f349b88d9bfb8c3985f371d3365e990cf4eb2b. --- .github/workflows/kafka-topics-dev.yaml | 5 +---- .github/workflows/kafka-topics-prod.yaml | 5 +---- .github/workflows/mr-admin-flate-container.yaml | 3 --- .github/workflows/mr-admin-flate.yaml | 3 --- .github/workflows/mr-api-alerts.yaml | 5 +---- .github/workflows/mr-api.yaml | 3 --- .github/workflows/mr-arena-adapter-alerts.yaml | 5 +---- .github/workflows/mr-arena-adapter-manager-container.yaml | 3 --- .github/workflows/mr-arena-adapter-manager.yaml | 3 --- .github/workflows/mr-arena-adapter.yaml | 3 --- .github/workflows/mr-sanity-studio.yaml | 3 --- .github/workflows/mr-veileder-flate-container.yaml | 3 --- .github/workflows/mr-veileder-flate.yaml | 3 --- .github/workflows/unleash-apitoken.yaml | 5 +---- 14 files changed, 5 insertions(+), 47 deletions(-) diff --git a/.github/workflows/kafka-topics-dev.yaml b/.github/workflows/kafka-topics-dev.yaml index 6fb936adbc..91f61a329a 100644 --- a/.github/workflows/kafka-topics-dev.yaml +++ b/.github/workflows/kafka-topics-dev.yaml @@ -5,9 +5,6 @@ on: paths: - .github/workflows/kafka-topics-dev.yaml - iac/kafka-topics/dev/*.yaml - push: - branches: - - main jobs: ci: @@ -25,7 +22,7 @@ jobs: name: Deploy kafka topics to dev runs-on: ubuntu-latest needs: [ci] - if: github.event_name == 'push' && github.ref_name == 'main' + if: github.ref_name == 'main' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/kafka-topics-prod.yaml b/.github/workflows/kafka-topics-prod.yaml index 3b0ce0eb8c..b90771d928 100644 --- a/.github/workflows/kafka-topics-prod.yaml +++ b/.github/workflows/kafka-topics-prod.yaml @@ -5,9 +5,6 @@ on: paths: - .github/workflows/kafka-topics-prod.yaml - iac/kafka-topics/prod/*.yaml - push: - branches: - - main jobs: ci: @@ -25,7 +22,7 @@ jobs: name: Deploy kafka topics to prod runs-on: ubuntu-latest needs: [ci] - if: github.event_name == 'push' && github.ref_name == 'main' + if: github.ref_name == 'main' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/mr-admin-flate-container.yaml b/.github/workflows/mr-admin-flate-container.yaml index baa3c6a774..84fb5af356 100644 --- a/.github/workflows/mr-admin-flate-container.yaml +++ b/.github/workflows/mr-admin-flate-container.yaml @@ -5,9 +5,6 @@ on: paths: - .github/workflows/mr-admin-flate-container.yaml - frontend/mr-admin-flate/.nais/** - push: - branches: - - main workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-admin-flate.yaml b/.github/workflows/mr-admin-flate.yaml index b05874afff..70bb6b91db 100644 --- a/.github/workflows/mr-admin-flate.yaml +++ b/.github/workflows/mr-admin-flate.yaml @@ -9,9 +9,6 @@ on: - turbo.json - frontend/mr-admin-flate/** - mulighetsrommet-api/src/main/resources/web/openapi.yaml - push: - branches: - - main workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-api-alerts.yaml b/.github/workflows/mr-api-alerts.yaml index 3f77adc558..6703c91e66 100644 --- a/.github/workflows/mr-api-alerts.yaml +++ b/.github/workflows/mr-api-alerts.yaml @@ -5,9 +5,6 @@ on: paths: - .github/workflows/mr-api-alerts.yaml - mulighetsrommet-api/.nais/alerts.yaml - push: - branches: - - main jobs: ci: @@ -25,7 +22,7 @@ jobs: name: Apply alerts to cluster runs-on: ubuntu-latest needs: [ci] - if: github.event_name == 'push' && github.ref_name == 'main' + if: github.ref_name == 'main' steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/mr-api.yaml b/.github/workflows/mr-api.yaml index 9b713f4fbf..3bf30d343d 100644 --- a/.github/workflows/mr-api.yaml +++ b/.github/workflows/mr-api.yaml @@ -10,9 +10,6 @@ on: - gradle/libs.versions.toml - common/** - mulighetsrommet-api/** - push: - branches: - - main workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-arena-adapter-alerts.yaml b/.github/workflows/mr-arena-adapter-alerts.yaml index f1d0f1fba4..b8a807d9f7 100644 --- a/.github/workflows/mr-arena-adapter-alerts.yaml +++ b/.github/workflows/mr-arena-adapter-alerts.yaml @@ -5,9 +5,6 @@ on: paths: - .github/workflows/mr-arena-adapter-alerts.yaml - mulighetsrommet-arena-adapter/.nais/alerts.yaml - push: - branches: - - main jobs: ci: @@ -25,7 +22,7 @@ jobs: name: Apply alerts to cluster runs-on: ubuntu-latest needs: [ci] - if: github.event_name == 'push' && github.ref_name == 'main' + if: github.ref_name == 'main' steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/mr-arena-adapter-manager-container.yaml b/.github/workflows/mr-arena-adapter-manager-container.yaml index 22867e6d81..0e2b13ac92 100644 --- a/.github/workflows/mr-arena-adapter-manager-container.yaml +++ b/.github/workflows/mr-arena-adapter-manager-container.yaml @@ -5,9 +5,6 @@ on: paths: - .github/workflows/mr-arena-adapter-manager-container.yaml - frontend/arena-adapter-manager/.nais/** - push: - branches: - - main workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-arena-adapter-manager.yaml b/.github/workflows/mr-arena-adapter-manager.yaml index 44e696c71e..dc07c52b18 100644 --- a/.github/workflows/mr-arena-adapter-manager.yaml +++ b/.github/workflows/mr-arena-adapter-manager.yaml @@ -8,9 +8,6 @@ on: - package-lock.json - turbo.json - frontend/arena-adapter-manager/** - push: - branches: - - main workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-arena-adapter.yaml b/.github/workflows/mr-arena-adapter.yaml index 30e09a3281..713dde14f7 100644 --- a/.github/workflows/mr-arena-adapter.yaml +++ b/.github/workflows/mr-arena-adapter.yaml @@ -10,9 +10,6 @@ on: - gradle/libs.versions.toml - common/** - mulighetsrommet-arena-adapter/** - push: - branches: - - main workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-sanity-studio.yaml b/.github/workflows/mr-sanity-studio.yaml index f20cf90f37..b1aa7f0266 100644 --- a/.github/workflows/mr-sanity-studio.yaml +++ b/.github/workflows/mr-sanity-studio.yaml @@ -8,9 +8,6 @@ on: - package-lock.json - turbo.json - frontend/mulighetsrommet-cms/** - push: - branches: - - main workflow_dispatch: concurrency: diff --git a/.github/workflows/mr-veileder-flate-container.yaml b/.github/workflows/mr-veileder-flate-container.yaml index db1a0624ac..2bd49b1b3e 100644 --- a/.github/workflows/mr-veileder-flate-container.yaml +++ b/.github/workflows/mr-veileder-flate-container.yaml @@ -5,9 +5,6 @@ on: paths: - .github/workflows/mr-veileder-flate-container.yaml - frontend/mulighetsrommet-veileder-flate/.nais/** - push: - branches: - - main workflow_dispatch: inputs: environment: diff --git a/.github/workflows/mr-veileder-flate.yaml b/.github/workflows/mr-veileder-flate.yaml index 0cf5583783..8a23979b1b 100644 --- a/.github/workflows/mr-veileder-flate.yaml +++ b/.github/workflows/mr-veileder-flate.yaml @@ -9,9 +9,6 @@ on: - turbo.json - frontend/mulighetsrommet-veileder-flate/** - mulighetsrommet-api/src/main/resources/web/openapi.yaml - push: - branches: - - main workflow_dispatch: inputs: environment: diff --git a/.github/workflows/unleash-apitoken.yaml b/.github/workflows/unleash-apitoken.yaml index c241ec7e5b..ea2e7a27da 100644 --- a/.github/workflows/unleash-apitoken.yaml +++ b/.github/workflows/unleash-apitoken.yaml @@ -6,9 +6,6 @@ on: - .github/workflows/unleash-apitoken.yaml - mulighetsrommet-api/.nais/unleash-apitoken-dev.yaml - mulighetsrommet-api/.nais/unleash-apitoken-prod.yaml - push: - branches: - - main jobs: ci: @@ -26,7 +23,7 @@ jobs: name: Apply ApiToken for Unleash to cluster runs-on: ubuntu-latest needs: [ci] - if: github.event_name == 'push' && github.ref_name == 'main' + if: github.ref_name == 'main' steps: - name: Checkout code uses: actions/checkout@v3 From c0e5f91b6e3967f37206aa6cd9a4f4caf61b4f55 Mon Sep 17 00:00:00 2001 From: Sondre Lefsaker Date: Tue, 5 Sep 2023 15:24:18 +0200 Subject: [PATCH 5/5] update workflow deploy conditions --- .github/workflows/kafka-manager.yaml | 3 --- .github/workflows/kafka-topics-dev.yaml | 2 +- .github/workflows/kafka-topics-prod.yaml | 2 +- .github/workflows/mr-api-alerts.yaml | 2 +- .github/workflows/mr-arena-adapter-alerts.yaml | 2 +- .github/workflows/unleash-apitoken.yaml | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/kafka-manager.yaml b/.github/workflows/kafka-manager.yaml index 3477103985..f25b164f68 100644 --- a/.github/workflows/kafka-manager.yaml +++ b/.github/workflows/kafka-manager.yaml @@ -5,9 +5,6 @@ on: paths: - .github/workflows/kafka-manager.yaml - iac/kafka-manager/** - push: - branches: - - main jobs: ci: diff --git a/.github/workflows/kafka-topics-dev.yaml b/.github/workflows/kafka-topics-dev.yaml index 91f61a329a..98815c5254 100644 --- a/.github/workflows/kafka-topics-dev.yaml +++ b/.github/workflows/kafka-topics-dev.yaml @@ -22,7 +22,7 @@ jobs: name: Deploy kafka topics to dev runs-on: ubuntu-latest needs: [ci] - if: github.ref_name == 'main' + if: github.event_name == 'push' && github.ref_name == 'main' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/kafka-topics-prod.yaml b/.github/workflows/kafka-topics-prod.yaml index b90771d928..199ef4e78c 100644 --- a/.github/workflows/kafka-topics-prod.yaml +++ b/.github/workflows/kafka-topics-prod.yaml @@ -22,7 +22,7 @@ jobs: name: Deploy kafka topics to prod runs-on: ubuntu-latest needs: [ci] - if: github.ref_name == 'main' + if: github.event_name == 'push' && github.ref_name == 'main' steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/mr-api-alerts.yaml b/.github/workflows/mr-api-alerts.yaml index 6703c91e66..4336c07e24 100644 --- a/.github/workflows/mr-api-alerts.yaml +++ b/.github/workflows/mr-api-alerts.yaml @@ -22,7 +22,7 @@ jobs: name: Apply alerts to cluster runs-on: ubuntu-latest needs: [ci] - if: github.ref_name == 'main' + if: github.event_name == 'push' && github.ref_name == 'main' steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/mr-arena-adapter-alerts.yaml b/.github/workflows/mr-arena-adapter-alerts.yaml index b8a807d9f7..79fc48e687 100644 --- a/.github/workflows/mr-arena-adapter-alerts.yaml +++ b/.github/workflows/mr-arena-adapter-alerts.yaml @@ -22,7 +22,7 @@ jobs: name: Apply alerts to cluster runs-on: ubuntu-latest needs: [ci] - if: github.ref_name == 'main' + if: github.event_name == 'push' && github.ref_name == 'main' steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/unleash-apitoken.yaml b/.github/workflows/unleash-apitoken.yaml index ea2e7a27da..63c2170033 100644 --- a/.github/workflows/unleash-apitoken.yaml +++ b/.github/workflows/unleash-apitoken.yaml @@ -23,7 +23,7 @@ jobs: name: Apply ApiToken for Unleash to cluster runs-on: ubuntu-latest needs: [ci] - if: github.ref_name == 'main' + if: github.event_name == 'push' && github.ref_name == 'main' steps: - name: Checkout code uses: actions/checkout@v3