fix: amend workflows for builds

dvsa · May 18, 2024 · c721aaa · c721aaa
1 parent a4594ee
commit c721aaa
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 31 deletions.
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -16,12 +16,11 @@ jobs:
       tag_name: ${{ steps.release.outputs.tag_name }}
       release_created: ${{ steps.release.outputs.release_created }}
     steps:
-      - uses: google-github-actions/release-please-action@v4
+      - uses: googleapis/release-please-action@v4
         id: release
         with:
           release-type: maven
-
-
+
   publish:
     if: ${{needs.release-please.outputs.release_created}}
     runs-on: ubuntu-latest
@@ -31,21 +30,25 @@ jobs:
     needs: 
       - release-please
     steps:
-        - name: checkout code
-          uses: actions/checkout@v4
+      - name: checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'corretto'
+          cache: 'maven'
 
-        - name: Set up JDK 11
-          uses: actions/setup-java@v4
-          with:
-            java-version: '11'
-            distribution: 'corretto'
-            cache: 'maven'
-
-        - name: Publish to GitHub Packages Apache Maven
-          uses: ./.github/workflows/maven.yaml
-          with:
-            maven-goal: deploy
-          env:
-            GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
-
+  push:
+      if: ${{needs.release-please.outputs.release_created}}
+      permissions:
+        contents: read
+        packages: write
+
+      name: Publish to GitHub Packages Apache Maven
+      uses: ./.github/workflows/maven.yaml
+      secrets: inherit
+      with:
+        maven-goal: deploy
+      needs: release-please
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
@@ -19,7 +19,9 @@ jobs:
       runs-on: ubuntu-latest
       steps:
        - uses: actions/checkout@v4
-
+       - uses: whelk-io/maven-settings-xml-action@v22
+         with:
+          servers: '[{ "id":"dvsa-github-packages", "configuration": { "httpHeaders": { "property": { "name":"Authorization", "value":"Bearer ${{ secrets.GITHUB_TOKEN }}"} } } },{ "id":"github-publish", "configuration": { "httpHeaders": { "property": { "name":"Authorization", "value":"Bearer ${{ secrets.GITHUB_TOKEN }}"} } } } ]'
+
        - run: mvn -B -P github ${{ inputs.maven-goal}}
-
 
diff --git a/pom.xml b/pom.xml
@@ -36,6 +36,13 @@
                     <releases><enabled>true</enabled></releases>
                 </repository>
             </repositories>
+            <distributionManagement>
+                <repository>
+                    <id>github-publish</id>
+                    <name>GitHub dvsa Apache Maven Packages</name>
+                    <url>${github.url}</url>
+                </repository>
+            </distributionManagement>
         </profile>
     </profiles>
 
@@ -95,13 +102,4 @@
             <version>2.2</version>
         </dependency>
     </dependencies>
-
-
-    <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>GitHub dvsa Apache Maven Packages</name>
-            <url>${github.url}</url>
-        </repository>
-    </distributionManagement>
 </project>