From abcaaab5d65d68b98570727f21879e31f81f622e Mon Sep 17 00:00:00 2001 From: Derick M <58572875+TurtIeSocks@users.noreply.github.com> Date: Tue, 6 Feb 2024 00:16:57 -0500 Subject: [PATCH 1/6] fix: needs & attempt to not run double --- .github/workflows/lint.yml | 6 ++---- .github/workflows/main.yml | 8 ++++---- .github/workflows/sentry.yml | 4 +--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4db8edb21..78067df92 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,11 +1,9 @@ name: Lint -on: - push: - pull_request: - types: [opened, synchronize, reopened] +on: [push, pull_request] jobs: lint: + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository name: Lint Check runs-on: ubuntu-latest steps: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89bb0bb55..f6dc9f4b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,8 +1,5 @@ name: Main CI -on: - push: - pull_request: - types: [opened, synchronize, reopened] +on: [push, pull_request] jobs: config: @@ -11,5 +8,8 @@ jobs: uses: ./.github/workflows/locales.yml release: uses: ./.github/workflows/release.yml + needs: [locales] docker: + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository uses: ./.github/workflows/docker.yml + needs: [locales] diff --git a/.github/workflows/sentry.yml b/.github/workflows/sentry.yml index 7f783e5e1..1d5931399 100644 --- a/.github/workflows/sentry.yml +++ b/.github/workflows/sentry.yml @@ -1,7 +1,5 @@ name: Sentry -on: - release: - types: [published] +on: release jobs: sentry: From aec24a3c5a773796581ef9ce76d7ab3d97cebb8e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 6 Feb 2024 05:19:23 +0000 Subject: [PATCH 2/6] chore(release): v1.29.4 [skip ci] ## [1.29.4](https://github.com/WatWowMap/ReactMap/compare/v1.29.3...v1.29.4) (2024-02-06) ### Bug Fixes * needs & attempt to not run double ([abcaaab](https://github.com/WatWowMap/ReactMap/commit/abcaaab5d65d68b98570727f21879e31f81f622e)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 030931c29..b16b1d7d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.29.4](https://github.com/WatWowMap/ReactMap/compare/v1.29.3...v1.29.4) (2024-02-06) + + +### Bug Fixes + +* needs & attempt to not run double ([abcaaab](https://github.com/WatWowMap/ReactMap/commit/abcaaab5d65d68b98570727f21879e31f81f622e)) + ## [1.29.3](https://github.com/WatWowMap/ReactMap/compare/v1.29.2...v1.29.3) (2024-02-06) diff --git a/package.json b/package.json index 9fc5c9255..cbbc4b9d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reactmap", - "version": "1.29.3", + "version": "1.29.4", "private": true, "description": "React based frontend map.", "license": "MIT", From e4b7cec18ce2b41b04c5813b7a8ece23a3bf5510 Mon Sep 17 00:00:00 2001 From: Derick M <58572875+TurtIeSocks@users.noreply.github.com> Date: Tue, 6 Feb 2024 00:19:51 -0500 Subject: [PATCH 3/6] fix: needs both --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6dc9f4b2..c5916af85 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,8 +8,8 @@ jobs: uses: ./.github/workflows/locales.yml release: uses: ./.github/workflows/release.yml - needs: [locales] + needs: [config, locales] docker: if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository uses: ./.github/workflows/docker.yml - needs: [locales] + needs: [config, locales] From 962859f46e1e71f1cd812b2383af20e58659d7ce Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 6 Feb 2024 05:22:24 +0000 Subject: [PATCH 4/6] chore(release): v1.29.5 [skip ci] ## [1.29.5](https://github.com/WatWowMap/ReactMap/compare/v1.29.4...v1.29.5) (2024-02-06) ### Bug Fixes * needs both ([e4b7cec](https://github.com/WatWowMap/ReactMap/commit/e4b7cec18ce2b41b04c5813b7a8ece23a3bf5510)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b16b1d7d9..11732ee94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.29.5](https://github.com/WatWowMap/ReactMap/compare/v1.29.4...v1.29.5) (2024-02-06) + + +### Bug Fixes + +* needs both ([e4b7cec](https://github.com/WatWowMap/ReactMap/commit/e4b7cec18ce2b41b04c5813b7a8ece23a3bf5510)) + ## [1.29.4](https://github.com/WatWowMap/ReactMap/compare/v1.29.3...v1.29.4) (2024-02-06) diff --git a/package.json b/package.json index cbbc4b9d2..76f041929 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reactmap", - "version": "1.29.4", + "version": "1.29.5", "private": true, "description": "React based frontend map.", "license": "MIT", From 78c14040007a33180f5fddf270aa155136ba87c2 Mon Sep 17 00:00:00 2001 From: Derick M <58572875+TurtIeSocks@users.noreply.github.com> Date: Tue, 6 Feb 2024 00:29:54 -0500 Subject: [PATCH 5/6] fix: run even when prev is skipped --- .github/workflows/main.yml | 3 ++- .github/workflows/sentry.yml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c5916af85..0e2de55b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,8 @@ jobs: release: uses: ./.github/workflows/release.yml needs: [config, locales] + if: always() docker: - if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository + if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository) && always() uses: ./.github/workflows/docker.yml needs: [config, locales] diff --git a/.github/workflows/sentry.yml b/.github/workflows/sentry.yml index 1d5931399..0621220c0 100644 --- a/.github/workflows/sentry.yml +++ b/.github/workflows/sentry.yml @@ -1,5 +1,7 @@ name: Sentry -on: release +on: + release: + types: [created, published] jobs: sentry: From 2d2d0f51e67638dd2eab83c21cad98f9d7cf3224 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 6 Feb 2024 05:32:20 +0000 Subject: [PATCH 6/6] chore(release): v1.29.6 [skip ci] ## [1.29.6](https://github.com/WatWowMap/ReactMap/compare/v1.29.5...v1.29.6) (2024-02-06) ### Bug Fixes * run even when prev is skipped ([78c1404](https://github.com/WatWowMap/ReactMap/commit/78c14040007a33180f5fddf270aa155136ba87c2)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11732ee94..0071d6434 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.29.6](https://github.com/WatWowMap/ReactMap/compare/v1.29.5...v1.29.6) (2024-02-06) + + +### Bug Fixes + +* run even when prev is skipped ([78c1404](https://github.com/WatWowMap/ReactMap/commit/78c14040007a33180f5fddf270aa155136ba87c2)) + ## [1.29.5](https://github.com/WatWowMap/ReactMap/compare/v1.29.4...v1.29.5) (2024-02-06) diff --git a/package.json b/package.json index 76f041929..85e160f72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reactmap", - "version": "1.29.5", + "version": "1.29.6", "private": true, "description": "React based frontend map.", "license": "MIT",