Merge pull request #122 from galasa-dev/gh-workflow

Run new GH Actions workflows
galasa-dev · Jul 24, 2024 · 4f718b6 · 4f718b6
2 parents 28e84ca + 904418d
commit 4f718b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,7 +10,7 @@ env:
   BRANCH: main
 
 jobs:
-  build-wrapping:
+  build-maven:
     name: Build Maven source code and Docker image for development Maven registry
     runs-on: ubuntu-latest
     steps:
@@ -68,12 +68,7 @@ jobs:
         run: |
           cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml
 
-      # Make directory to deploy Maven artefacts to in the build
-      - name: Make artefacts directory
-        run : |
-          mkdir ${{ github.workspace }}/repo
-
-      - name: Building Maven source code
+      - name: Build Maven source code
         run: |
           mvn -f galasa-maven-plugin/pom.xml deploy \
           -Dgalasa.source.repo=https://development.galasa.dev/gh/maven-repo/gradle \
@@ -82,7 +77,7 @@ jobs:
           -Dgalasa.jacocoEnabled=true \
           -Dgalasa.isRelease=true \
           --batch-mode --errors --fail-at-end \
-          --settings  /home/runner/work/gpg/settings.xml
+          --settings /home/runner/work/gpg/settings.xml
 
       - name: Login to Github Container Registry
         uses: docker/login-action@v3
@@ -95,7 +90,7 @@ jobs:
         id: metadata
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/Mavenrepo-maven-artefacts
+          images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/maven-maven-artefacts
 
       - name: Build Maven image for development Maven registry
         id: build
@@ -108,7 +103,7 @@ jobs:
           labels: ${{ steps.metadata.outputs.labels }}
           build-args: |
             dockerRepository=harbor.galasa.dev
-            baseVersion=latest
+            tag=main
 
       # Recycle the development Maven registry app in ArgoCD
       # Authenticate using a token passed in as an environment variable

diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml
@@ -66,22 +66,17 @@ jobs:
       - name: Copy custom settings.xml
         run: |
           cp /home/runner/work/secrets/settings.xml /home/runner/work/gpg/settings.xml
-
-      - name: Make artefacts directory
-        run : |
-          mkdir ${{ github.workspace }}/repo
       
       - name: Building Maven source code
         run: |
           mvn -f galasa-maven-plugin/pom.xml deploy -Dgpg.skip=true \
           -Dgalasa.source.repo=https://development.galasa.dev/gh/maven-repo/gradle \
           -Dgalasa.central.repo=https://repo.maven.apache.org/maven2/ \
           -Dgalasa.release.repo=file:${{ github.workspace }}/repo \
-          --batch-mode --errors --fail-at-end 
-          --settings  /home/runner/work/gpg/settings.xml
-
+          --batch-mode --errors --fail-at-end \
+          --settings /home/runner/work/gpg/settings.xml
 
-      - name: Build maven Image for testing
+      - name: Build Maven image for testing
         uses: docker/build-push-action@v5
         with:
             context: .