Skip to content

Commit f8803b6

Browse files
authored
Merge pull request #30 from os2ulf/release/2024-01
Release/2024 01
2 parents 2bdc1a4 + c8a39ec commit f8803b6

File tree

30 files changed

+1054
-312
lines changed

30 files changed

+1054
-312
lines changed

.github/workflows/auto-merge-to-staging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Announce deploy to Slack
1010
environment: Staging
1111
runs-on: ubuntu-latest
12-
if: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main') }}
12+
if: ${{ github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || contains(github.ref, 'release')) }}
1313
steps:
1414
- name: Announce to slack
1515
uses: 8398a7/action-slack@v3
@@ -38,4 +38,4 @@ jobs:
3838
git fetch origin
3939
git checkout staging
4040
git merge ${{ github.ref }} --no-ff -m "Merging release branch ${{ github.ref }} into staging"
41-
git push origin staging
41+
git push origin staging

0 commit comments

Comments
 (0)