Merge branch 'main' into release

nitrite · Jan 4, 2024 · 539f49d · 539f49d
2 parents 7f4c139 + d6db082
commit 539f49d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,7 +37,6 @@ jobs:
           server-password: MAVEN_PASSWORD
 
       - name: Prepare PGP Keys
-        if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/release'
         run: |
           chmod +x ./.ci/prepare-keys.sh
           ./.ci/prepare-keys.sh
@@ -46,7 +45,7 @@ jobs:
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Deploy Release
-        if: github.ref == 'refs/heads/release' && !contains(github.event.head_commit.message, '[ci release]')
+        if: !contains(github.event.head_commit.message, '[ci release]')
         run: mvn -B -ff -ntp release:clean release:prepare release:perform -DskipTests
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -37,7 +37,6 @@ jobs:
           server-password: MAVEN_PASSWORD
 
       - name: Prepare PGP Keys
-        if: github.ref == 'refs/heads/develop'
         run: |
           chmod +x ./.ci/prepare-keys.sh
           ./.ci/prepare-keys.sh
@@ -46,7 +45,6 @@ jobs:
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Deploy Snapshot
-        if: github.ref == 'refs/heads/develop'
         run: mvn -B -ff -ntp deploy -DskipTests
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}