Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restored broken actions #146

Merged
merged 1 commit into from
Mar 22, 2024
Merged

restored broken actions #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ GIT_REMOTE_URL := $(shell echo "$(GIT_REMOTE_URL)" | sed 's/\.git//')
GIT_REMOTE_URL := $(shell echo "$(GIT_REMOTE_URL)" | sed 's/git@/https:\/\//')
GIT_REMOTE_URL := $(shell echo "$(GIT_REMOTE_URL)" | sed 's/com:/com\//')
PR_OR_COMMIT_URL ?= "$(GIT_REMOTE_URL)/commits/$(shell git rev-parse --short=8 HEAD)"

ifndef GIT_TOKEN
ifeq ($(wildcard .git_token),)
$(error No Git token found. Please provide it either via the GIT_TOKEN variable or the .git_token file)
endif
GIT_TOKEN ?= $(shell cat .git_token)
endif

LINUX_IMAGE ?= quay.io/orchestrator/ubi9-pipeline:latest
JDK_IMAGE ?= registry.access.redhat.com/ubi9/openjdk-17:1.17
Expand Down
2 changes: 1 addition & 1 deletion scripts/push_manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ git switch -c autopr-${RANDOM} origin/"${DEPLOYMENT_BRANCH}"
# We assume the kustomize project already exists, this is not part of the PR
cp ../"${WORKFLOW_ID}"/manifests/* kustomize/"${WORKFLOW_ID}"/base
# Applying image kustomization
cd kustomize/"${WORKFLOW_ID}"/overlays/prod || exit
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change here in this PR?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's related to another change in the "config" repo structure that has never been adjusted in these script. do you prefer a dedicated PR? w/o this change the action would fail again

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it's fine, I was just making sure it was not something you missed :)

cd kustomize/"${WORKFLOW_ID}"/base || exit
if [ -n "$APPLICATION_ID" ] && [ "$APPLICATION_ID" != "UNDEFINED" ]; then
kustomize edit set image serverless-workflow-"${APPLICATION_ID}"="${IMAGE_NAME}":"${IMAGE_TAG}"
else
Expand Down
Loading