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 c52a898 + 962859f commit 014c8a5
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 12 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Main CI
on:
push:
pull_request:
types: [opened, synchronize, reopened]
on: [push, pull_request]

jobs:
config:
Expand All @@ -11,5 +8,8 @@ jobs:
uses: ./.github/workflows/locales.yml
release:
uses: ./.github/workflows/release.yml
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: [config, locales]
4 changes: 1 addition & 3 deletions .github/workflows/sentry.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
name: Sentry
on:
release:
types: [published]
on: release

jobs:
sentry:
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## [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)


### 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)

### Bug Fixes
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.3",
"version": "1.29.5",
"private": true,
"description": "React based frontend map.",
"license": "MIT",
Expand Down

0 comments on commit 014c8a5

Please sign in to comment.