diff --git a/.github/workflows/update-catalyst-ci-deps.yml b/.github/workflows/update-catalyst-ci-deps.yml index 541f5cb37..a9eaa7f58 100644 --- a/.github/workflows/update-catalyst-ci-deps.yml +++ b/.github/workflows/update-catalyst-ci-deps.yml @@ -16,6 +16,10 @@ on: description: "Comma separated list of repositories" type: string default: "" + test: + description: "" + type: string + default: "" jobs: update_ci_deps: @@ -23,4 +27,5 @@ jobs: with: notify_type: ${{ github.event_name == 'workflow_dispatch' && inputs.notify_type || 'pr' }} repos: ${{ inputs.repos != '' && inputs.repos || 'input-output-hk/catalyst-voices, input-output-hk/hermes, input-output-hk/catalyst-libs, input-output-hk/catalyst-reviews, input-output-hk/catalyst-som, input-output-hk/catalyst-execution, input-output-hk/norns' }} + test: ${{ inputs.test }} secrets: inherit diff --git a/.github/workflows/update-catalyst-deps.yml b/.github/workflows/update-catalyst-deps.yml index b49c77f49..73513eab1 100644 --- a/.github/workflows/update-catalyst-deps.yml +++ b/.github/workflows/update-catalyst-deps.yml @@ -11,6 +11,10 @@ on: description: "Comma separated list of repositories" type: string default: "" + test: + description: "" + type: string + default: "" permissions: contents: write @@ -31,8 +35,13 @@ jobs: - name: Get release info id: release_info run: | - echo "tag_name=$(gh release list -R ${{ github.repository }} --json name,isLatest --jq '.[] | select(.isLatest)|.name')" >> $GITHUB_OUTPUT - echo "release_url=$(gh release view -R ${{ github.repository }} $tag_name --json url | jq -r .[])" >> $GITHUB_OUTPUT + if [ "${{ inputs.test }}" == "" ]; then + echo "tag_name=$(gh release list -R ${{ github.repository }} --json name,isLatest --jq '.[] | select(.isLatest)|.name')" >> $GITHUB_OUTPUT + echo "release_url=$(gh release view -R ${{ github.repository }} $tag_name --json url | jq -r .[])" >> $GITHUB_OUTPUT + else + echo "tag_name=${{ inputs.test }}" >> $GITHUB_OUTPUT + echo "release_url=${{ inputs.test }}" >> $GITHUB_OUTPUT + fi - name: Generate repos matrix id: matrix @@ -52,18 +61,32 @@ jobs: repository: ${{ matrix.repo }} token: ${{ secrets.CI_BOT_TOKEN }} + - name: Import GPG key + id: import-gpg + uses: crazy-max/ghaction-import-gpg@v6 + with: + gpg_private_key: ${{ secrets.CI_BOT_GPG_PRIVATE_KEY }} + passphrase: ${{ secrets.CI_BOT_GPG_PASSPHRASE }} + git_user_signingkey: true + git_commit_gpgsign: true + git_config_global: true + - name: Create PR or Issue for dependent repository env: RELEASE_TAG: ${{ needs.notify-dependents.outputs.tag_name }} RELEASE_URL: ${{ needs.notify-dependents.outputs.release_url }} + GIT_AUTHOR_NAME: ${{ steps.import-gpg.outputs.name }} + GIT_AUTHOR_EMAIL: ${{ steps.import-gpg.outputs.email }} + GIT_COMMITTER_NAME: ${{ steps.import-gpg.outputs.name }} + GIT_COMMITTER_EMAIL: ${{ steps.import-gpg.outputs.email }} run: | set -e UPDATED_REPO="github.com/${{ github.repository }}" REPO_NAME=$(echo ${{ github.repository }} | cut -d/ -f2) - git config --global user.name catalyst-cibot - git config --global user.email "catalyst-cibot@projectcatalyst.io" + # git config --global user.name catalyst-cibot + # git config --global user.email "catalyst-cibot@projectcatalyst.io" if [ "${{ inputs.notify_type }}" == "pr" ]; then echo "Create PR in ${{ matrix.repo }}" @@ -81,7 +104,7 @@ jobs: exit 0 fi - git commit -m "chore($REPO_NAME): Update $REPO_NAME to $RELEASE_TAG" + git commit -S -m "chore($REPO_NAME): Update $REPO_NAME to $RELEASE_TAG" git push origin "$branch_name" gh pr create \ diff --git a/utilities/cql-to-d2/Earthfile b/utilities/cql-to-d2/Earthfile index 342f0eead..df880407b 100644 --- a/utilities/cql-to-d2/Earthfile +++ b/utilities/cql-to-d2/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.21 AS python-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:DO-NOT-MERGE AS python-ci check: FROM python-ci+python-base diff --git a/utilities/earthly-cache-watcher/Earthfile b/utilities/earthly-cache-watcher/Earthfile index a5a949ae8..00ddc0d8c 100644 --- a/utilities/earthly-cache-watcher/Earthfile +++ b/utilities/earthly-cache-watcher/Earthfile @@ -1,6 +1,6 @@ VERSION 0.8 -IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.21 AS python-ci +IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:DO-NOT-MERGE AS python-ci check: FROM python-ci+python-base