Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
TurtIeSocks committed Feb 6, 2024
2 parents 014c8a5 + 2d2d0f5 commit ccea200
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
4 changes: 3 additions & 1 deletion .github/workflows/sentry.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: Sentry
on: release
on:
release:
types: [created, published]

jobs:
sentry:
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "reactmap",
"version": "1.29.5",
"version": "1.29.6",
"private": true,
"description": "React based frontend map.",
"license": "MIT",
Expand Down

0 comments on commit ccea200

Please sign in to comment.