Merge branch 'refactor/simplify-project-structure' into test/validati…

…on-workflow
mcollovati · Dec 27, 2023 · 4250410 · 4250410
2 parents 95d2e13 + 95c2bbe
commit 4250410
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/deploy-classifiers.yml b/.github/workflows/deploy-classifiers.yml
@@ -29,8 +29,8 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
           server-id: repsy-vertx-vaadin
-          server-username: ${{ secrets.REPSY_USERNAME }}
-          server-password: ${{ secrets.REPSY_PASSWORD }}
+          server-username: REPSY_USERNAME
+          server-password: REPSY_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
       - name: Deploy classifiers
@@ -40,4 +40,6 @@ jobs:
           KIND=$( [[ "${PRJ_VERSION}" =~ "-SNAPSHOT"$ ]] && echo "snapshot" || echo "release" )
           DEPLOY_OPTS="-Ddistribution.id=repsy-vertx-vaadin -Dvertx-vaadin.release.gpg" ./tools/build_flow_widgetsets.sh deploy ${KIND}
         env:
+          REPSY_USERNAME: ${{ secrets.REPSY_USERNAME }}
+          REPSY_PASSWORD: ${{ secrets.REPSY_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -288,16 +288,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: ${{ env.JAVA_VERSION }}
-          server-id: repsy-vertx-vaadin-snapshots
-          server-username: mcollovati
-          server-password: ${{ secrets.REPSY_PASSWORD }}
-          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
       - uses: actions/download-artifact@v3
         if: ${{ github.run_attempt == 1 }}
         with:
@@ -308,6 +298,16 @@ jobs:
           set -x
           tar xf workspace.tar
           tar cf - .m2 | (cd ~ && tar xf -)
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ env.JAVA_VERSION }}
+          server-id: repsy-vertx-vaadin-snapshots
+          server-username: REPSY_USERNAME
+          server-password: REPSY_PASSWORD
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
       - name: Build
         if: ${{ github.run_attempt > 1 }}
         run: |
@@ -318,4 +318,6 @@ jobs:
           mvn -V -e -B -ntp -DskipVertxRun=true -DskipTests -Dvertx-vaadin.release=snapshot -Dvertx-vaadin.release.gpg deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPSY_USERNAME: ${{ secrets.REPSY_USERNAME }}
+          REPSY_PASSWORD: ${{ secrets.REPSY_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}