diff --git a/.github/workflows/update-submodule-files.yml b/.github/workflows/update-submodule-files.yml index 44b12d4..cf7b3c7 100644 --- a/.github/workflows/update-submodule-files.yml +++ b/.github/workflows/update-submodule-files.yml @@ -18,7 +18,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 with: - # Checkout the repository at the merge commit ref: ${{ github.event.pull_request.head.sha }} submodules: true @@ -30,7 +29,7 @@ jobs: - name: Import GPG key run: | echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --batch --import - echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --passphrase-fd 0 --pinentry-mode loopback --edit-key F768450FB05B817D0B4BC26FB9B6A9B428C8676A trust quit + echo "B9B6A9B428C8676A:6:" | gpg --batch --import-ownertrust - name: Run update script run: python update_repo.py @@ -41,11 +40,10 @@ jobs: run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'strangeranger@hthompson.dev' - git config --global user.signingkey F768450FB05B817D0B4BC26FB9B6A9B428C8676A + git config --global user.signingkey B9B6A9B428C8676A git config --global commit.gpgSign true git config --global gpg.program gpg git add . - echo "$GPG_PASSPHRASE" | gpg --batch --yes --passphrase-fd 0 --pinentry-mode loopback --sign git commit -m "Update files based on submodule changes" -S git pull --rebase origin ${{ github.event.pull_request.head.ref }} git push origin HEAD:${{ github.event.pull_request.head.ref }}