Compare commits

..

No commits in common. "main" and "v1.1.42" have entirely different histories.

4 changed files with 5 additions and 20 deletions

View File

@ -24,17 +24,7 @@ jobs:
TAG=`echo $ISSUE_COMMENT_STRING | jq -r ".tag"`
REPO=`echo $ISSUE_COMMENT_STRING | jq -r ".repo"`
SENDER=`echo $ISSUE_COMMENT_STRING | jq -r ".sender"`
# Try to extract docker_repo from issue comment, fallback to default variable
DOCKER_REPO_FROM_COMMENT=`echo $ISSUE_COMMENT_STRING | jq -r ".docker_repo"`
if [ -n "$DOCKER_REPO_FROM_COMMENT" ] && [ "$DOCKER_REPO_FROM_COMMENT" != "null" ]; then
DOCKER_REPO=$DOCKER_REPO_FROM_COMMENT/$REPO
echo "Using docker_repo from issue comment: $DOCKER_REPO"
else
DOCKER_REPO=${{ vars.docker_repo2_registry }}/$REPO
echo "Using fallback docker_repo: $DOCKER_REPO"
fi
echo "TAG=$TAG" >> "$GITHUB_OUTPUT";
echo "REPO=$REPO" >> "$GITHUB_OUTPUT";
echo "SENDER=$SENDER" >> "$GITHUB_OUTPUT";
@ -62,7 +52,7 @@ jobs:
with:
github-server-url: ${{ github.server_url }}
repository: gmetribin/deploy-tools
ref: v1.1.42
ref: v1.1.41
path: deploy-tools
# token: $\{{ github.token }} # DEFAULT / Any pushes with github.token don't trigger a chained build

View File

@ -9,10 +9,6 @@ on:
description: 'The cs repo that contains this image'
required: true
type: string
docker_repo:
description: 'The name of the action variable containing the docker repo value'
required: false
type: string
jobs:
trigger-cs-job:
@ -36,8 +32,7 @@ jobs:
- name: Push image name and tag to cs repo's latest issue with label workflow
run: |
DOCKER_REPO_VALUE="${{ vars[inputs.docker_repo] }}"
ISSUE_COMMENT_STRING=`echo "{ \"docker_repo\": \"$DOCKER_REPO_VALUE\", \"repo\": \"${{ steps.get-id.outputs.REPO }}\", \"tag\": \"${{ steps.get-id.outputs.TAG }}\", \"sender\": \"${{ github.event.sender.login }}\" }" | jq tostring`
ISSUE_COMMENT_STRING=`echo "{ \"repo\": \"${{ steps.get-id.outputs.REPO }}\", \"tag\": \"${{ steps.get-id.outputs.TAG }}\", \"sender\": \"${{ github.event.sender.login }}\" }" | jq tostring`
echo ISSUE_COMMENT_STRING: $ISSUE_COMMENT_STRING
API_JSON_BODY=`echo '{"body": '$ISSUE_COMMENT_STRING' }' | jq -r tostring`

View File

@ -61,7 +61,7 @@ jobs:
with:
github-server-url: ${{ github.server_url }}
repository: gmetribin/deploy-tools
ref: v1.1.42
ref: v1.1.41
path: deploy-tools
- name: Increment cs version in nm repo and push

2
.gitignore vendored
View File

@ -129,4 +129,4 @@ dist
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
.idea/