Apply actual release configuration.

raphw · Nov 5, 2019 · 148dd00 · 148dd00
1 parent 7caf35f
commit 148dd00
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,6 +7,7 @@ on:
   pull_request:
     branches: 
       - master
+      - release
   schedule:
     - cron: "0 0 * * 1"
 
@@ -74,7 +75,7 @@ jobs:
           java-version: 1.6
           architecture: x64
       - name: Build project
-        run: ./mvnw -s nossl.settings.xml verify -Pintegration -Pjava6
+        run: ./mvnw -s .mvn/nossl.settings.xml verify -Pintegration -Pjava6
   openj9-supported:
     name: OpenJ9 (supported)
     strategy:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,4 +22,4 @@ jobs:
           echo "${{ secrets.gpg_public }}" | gpg --import
           echo "${{ secrets.gpg_secret }}" | gpg --batch --import
       - name: Release project
-        run: ./mvnw -s release.settings.xml release:prepare release:perform -DdryRun=true -pl !byte-buddy-gradle-plugin -Dbintray.username=${{ secrets.bintray_username }} -Dbintray.password=${{ secrets.bintray_password }} -Dgpg.passphrase=${{ secrets.gpg_passphrase }} -Dgradle.publish.key=${{ secrets.gradle_key }} -Dgradle.publish.secret=${{ secrets.gradle_secret }}
+        run: ./mvnw -s .mvn/release.settings.xml release:prepare release:perform -Dbintray.username=${{ secrets.bintray_username }} -Dbintray.password=${{ secrets.bintray_password }} -Dgpg.passphrase=${{ secrets.gpg_passphrase }} -Dgradle.publish.key=${{ secrets.gradle_key }} -Dgradle.publish.secret=${{ secrets.gradle_secret }}
diff --git a/nossl.settings.xml → .mvn/nossl.settings.xml b/nossl.settings.xml → .mvn/nossl.settings.xml
diff --git a/release.settings.xml → .mvn/release.settings.xml b/release.settings.xml → .mvn/release.settings.xml