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

Fix GH workflow #960

Merged
merged 2 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }}
build-args: |
dockerRepository=harbor.galasa.dev
dockerRepository=ghcr.io
tag=${{ env.IMAGE_TAG }}

- name: Recycle application in ArgoCD
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ jobs:
load: true
tags: managers:test
build-args: |
dockerRepository=harbor.galasa.dev
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-extensions:${tag}
FROM ${dockerRepository}/galasa-dev/extensions-maven-artefacts:${tag}

COPY repo/ /usr/local/apache2/htdocs/
COPY managers.githash /usr/local/apache2/htdocs/managers.githash
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ repositories {
}

signing {
def signingKeyId = findProperty("signingKeyId")
def signingKey = findProperty("signingKey")
def signingPassword = findProperty("signingPassword")
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
sign publishing.publications
}

Expand Down Expand Up @@ -108,8 +112,8 @@ publishing {

if ("$targetMaven".startsWith('http')) {
credentials {
username System.getenv('MAVENUSERNAME')
password System.getenv('MAVENPASSWORD')
username System.getenv("GITHUB_ACTOR")
password System.getenv("GITHUB_TOKEN")
}
}
}
Expand Down