Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #255 from galasa-dev/gh-workflow
Browse files Browse the repository at this point in the history
Fix indentation and improve readability
  • Loading branch information
jadecarino authored Jul 25, 2024
2 parents cf6ce1a + 40f500c commit 3168cab
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 100 deletions.
123 changes: 62 additions & 61 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,74 +1,75 @@
name: Main build

on:
push:
branches: [main]
push:
branches: [main]

env:
REGISTRY: ghcr.io
NAMESPACE: galasa-dev
IMAGE_TAG: main

jobs:
build-extensions:
name: build and Test Extensions
runs-on: ubuntu-latest
build-extensions:
name: Build Extensions source code and Docker image for development Maven registry
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v4

- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'semeru'

- name: Print githash
run: |
echo $GITHUB_SHA > ./extensions.githash
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 6.9.2

- name: Test and Build Extensions using gradle
env:
GITHUB_ACTOR: ${{github.actor}}
GITHUB_TOKEN: ${{ github.token }}
ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEYID }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
run: |
gradle -b galasa-extensions-parent/build.gradle check publish \
-PsourceMaven=https://development.galasa.dev/gh/maven-repo/framework \
-PcentralMaven=https://repo.maven.apache.org/maven2/ \
-PtargetMaven=${{ github.workspace }}/repo -PjacocoEnabled=true -PisMainOrRelease=true
steps:
- name: Checkout Code
uses: actions/checkout@v4

- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'semeru'

- name: Print githash
run: |
echo $GITHUB_SHA > ./extensions.githash
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 6.9.2

- name: Extract metadata for Extensions image
id: metadata
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/extensions-maven-artefacts

- name: Build Extensions image for development Maven registry
id: build
uses: docker/build-push-action@v5
with:
context: .
file: dockerfiles/dockerfile
push: true
tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }}
build-args: |
dockerRepository=harbor.galasa.dev
tag=${{ env.IMAGE_TAG }}
- name: Build Extensions source code with gradle
env:
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.GPG_KEYID }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
run: |
gradle -b galasa-extensions-parent/build.gradle check publish \
-PsourceMaven=https://development.galasa.dev/gh/maven-repo/framework \
-PcentralMaven=https://repo.maven.apache.org/maven2/ \
-PtargetMaven=${{ github.workspace }}/repo \
-PjacocoEnabled=true \
-PisMainOrRelease=true
- name: Extract metadata for Extensions image
id: metadata
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: ${{ env.REGISTRY }}/${{ env.NAMESPACE }}/extensions-maven-artefacts

- name: Recycle application in ArgoCD
env:
ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
run: |
docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name extensions-gh --server argocd.galasa.dev
- name: Build Extensions image for development Maven registry
id: build
uses: docker/build-push-action@v5
with:
context: .
file: dockerfiles/dockerfile
push: true
tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }}
build-args: |
dockerRepository=ghcr.io
tag=${{ env.IMAGE_TAG }}
- name: Recycle application in ArgoCD
env:
ARGOCD_AUTH_TOKEN: ${{ secrets.ARGOCD_TOKEN }}
run: |
docker run --env ARGOCD_AUTH_TOKEN=${{ env.ARGOCD_AUTH_TOKEN }} --rm -v ${{ github.workspace }}:/var/workspace ghcr.io/galasa-dev/argocdcli:main app actions run gh-maven-repos restart --kind Deployment --resource-name extensions-gh --server argocd.galasa.dev
76 changes: 38 additions & 38 deletions .github/workflows/pr-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,46 @@ on:
branches: [main]

env:
NAMESPACE: galasa-dev
NAMESPACE: galasa-dev

jobs:
build-extensions:
name: build,Test and Publish Extensions
runs-on: ubuntu-latest
build-extensions:
name: Build Extensions source code
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'semeru'
- name: Print githash
run: |
echo $GITHUB_SHA > ./extensions.githash
steps:
- name: Checkout Code
uses: actions/checkout@v4

- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'semeru'

- name: Print githash
run: |
echo $GITHUB_SHA > ./extensions.githash
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 6.9.2
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 6.9.2

- name: Test and Build Extensions using gradle
run: |
gradle -b galasa-extensions-parent/build.gradle check publish \
-PsourceMaven=https://development.galasa.dev/gh/maven-repo/framework \
-PcentralMaven=https://repo.maven.apache.org/maven2/ \
-PtargetMaven=${{ github.workspace }}/repo
- name: Build extensions Image for testing
uses: docker/build-push-action@v5
with:
context: .
file: dockerfiles/dockerfile
load: true
tags: extensions:test
build-args: |
dockerRepository=harbor.galasa.dev
tag=main
- name: Build Extensions source code with gradle
run: |
gradle -b galasa-extensions-parent/build.gradle check publish \
-PsourceMaven=https://development.galasa.dev/gh/maven-repo/framework \
-PcentralMaven=https://repo.maven.apache.org/maven2/ \
-PtargetMaven=${{ github.workspace }}/repo
- name: Build Extensions image for testing
uses: docker/build-push-action@v5
with:
context: .
file: dockerfiles/dockerfile
load: true
tags: extensions:test
build-args: |
dockerRepository=ghcr.io
tag=main
2 changes: 1 addition & 1 deletion dockerfiles/dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG dockerRepository
ARG tag
FROM ${dockerRepository}/galasadev/galasa-framework:${tag}
FROM ${dockerRepository}/galasa-dev/framework-maven-artefacts:${tag}

COPY repo/ /usr/local/apache2/htdocs/
COPY extensions.githash /usr/local/apache2/htdocs/extensions.githash

0 comments on commit 3168cab

Please sign in to comment.