Merge branch 'dev' of https://github.com/RADAR-base/ManagementPortal …

…into feature/ory-based-authorization
RADAR-base · Sep 26, 2024 · d5f0613 · d5f0613
2 parents f2af901 + 5828ee1
commit d5f0613
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 1,912 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -101,7 +101,7 @@ jobs:
         env:
           OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish
+        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish
 
   # Check that the docker image builds correctly
   docker:
@@ -210,9 +210,9 @@ jobs:
 #        run: |
 #          cp src/test/resources/config/keystore.p12 src/main/docker/etc/config
 #          ./gradlew -Pprod buildDocker -x test -x javadocJar
-#          docker-compose -f src/main/docker/app.yml up -d
+#          docker compose -f src/main/docker/app.yml up -d
 #          yarn run e2e-prod
-#          docker-compose -f src/main/docker/app.yml down -v
+#          docker compose -f src/main/docker/app.yml down -v
 
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -63,10 +63,10 @@ jobs:
         id: e2e
         run: |
           cp src/test/resources/config/keystore.p12 src/main/resources/config/keystore.p12
-          docker-compose -f src/main/docker/postgresql.yml up -d
+          docker compose -f src/main/docker/postgresql.yml up -d
           ./gradlew bootRun -Pprod -Pe2e-prod-test &>mp.log </dev/null &
           yarn run e2e-prod
-          docker-compose -f src/main/docker/postgresql.yml down -v
+          docker compose -f src/main/docker/postgresql.yml down -v
           ./gradlew --stop
 
       - name: Upload screenshots of failed e2e tests

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
         env:
           OSSRH_USER: ${{ secrets.OSSRH_USER }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew -Psigning.gnupg.keyName=${{ secrets.OSSRH_GPG_SECRET_KEY_NAME }} -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository
 
   # Build and push tagged release docker image
   docker: