From a5c8e32934a0fc30b310096b13033e2950c1b4e2 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Tue, 5 Dec 2023 05:39:25 -0700 Subject: [PATCH 1/7] dependabot no longer update submodules --- .github/dependabot.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4475e98b..f037cdc7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,6 @@ version: 2 updates: - - directory: / - package-ecosystem: gitsubmodule - schedule: - interval: "daily" - - directory: / package-ecosystem: "npm" schedule: From 8d6c98d1552998e0050bc24b51b5e1ce0fd2f836 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Tue, 5 Dec 2023 05:58:35 -0700 Subject: [PATCH 2/7] update submodule and submit PR --- .github/workflows/submodule-update.yml | 56 ++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/workflows/submodule-update.yml diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml new file mode 100644 index 00000000..7c153399 --- /dev/null +++ b/.github/workflows/submodule-update.yml @@ -0,0 +1,56 @@ +name: Update submodules +on: + workflow_dispatch: + schedule: + - cron: '0 18 * * *' +jobs: + update_submodules: + name: Update submodules + runs-on: ubuntu-latest + steps: + - name: Checkout D2AI + uses: actions/checkout@v4 + with: + submodules: recursive + + - uses: pnpm/action-setup@v2 + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: 18.x + cache: pnpm + + - name: Update submodules + run: git submodule update --remote --recursive + + - name: porcelain check + uses: dorny/paths-filter@v2 + id: data + with: + base: HEAD + filters: | + changed: + - '**' + + - name: pnpm generate-font + if: steps.data.outputs.changed == 'true' + run: | + pnpm install --frozen-lockfile --prefer-offline + pnpm build + pnpm generate-font + + - name: Create Pull Request + if: steps.data.outputs.changed == 'true' + uses: peter-evans/create-pull-request@v5 + with: + token: ${{ secrets.PAT }} + commit-message: submodule update + committer: D2AI Bot + author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> + title: 'submodule update: generate-font' + body: | + Submodule Update + generate-font + + branch: submodule-update-v${{ github.event.client_payload.config.env.MANIFEST_VERSION }} From 2ae5471e425fb881d84534e1bb33b8aa00cf38e6 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Tue, 5 Dec 2023 05:58:54 -0700 Subject: [PATCH 3/7] auto-merge submodule updates --- .github/workflows/submodule-auto-merge.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/submodule-auto-merge.yml diff --git a/.github/workflows/submodule-auto-merge.yml b/.github/workflows/submodule-auto-merge.yml new file mode 100644 index 00000000..1046ba2a --- /dev/null +++ b/.github/workflows/submodule-auto-merge.yml @@ -0,0 +1,17 @@ +name: D2AI auto-merge +on: pull_request + +permissions: + contents: write + pull-requests: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: ${{ github.actor == 'd2ai-bot' && github.event.pull_request.title == 'submodule update: generate-font' }} + steps: + - name: Enable auto-merge for submodule updates + run: gh pr merge --auto --merge "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From bd170f9aa02b04df26e5fddf2bc42fa00793dec2 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Tue, 5 Dec 2023 06:02:24 -0700 Subject: [PATCH 4/7] . --- .github/workflows/submodule-update.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index 7c153399..9d5daef6 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -3,6 +3,7 @@ on: workflow_dispatch: schedule: - cron: '0 18 * * *' + jobs: update_submodules: name: Update submodules From 4ea709990cd6608a729c2c36e51a879a0fc8bc06 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Tue, 5 Dec 2023 08:00:15 -0700 Subject: [PATCH 5/7] generate-font already does build no need to build twice --- .github/workflows/submodule-update.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/submodule-update.yml b/.github/workflows/submodule-update.yml index 9d5daef6..074e0d85 100644 --- a/.github/workflows/submodule-update.yml +++ b/.github/workflows/submodule-update.yml @@ -38,7 +38,6 @@ jobs: if: steps.data.outputs.changed == 'true' run: | pnpm install --frozen-lockfile --prefer-offline - pnpm build pnpm generate-font - name: Create Pull Request From 5c7420a0856a9e7b629afbe37e57c3bf00b3b4eb Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Tue, 5 Dec 2023 08:01:21 -0700 Subject: [PATCH 6/7] update name to reflect actual behavior --- .github/workflows/submodule-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/submodule-auto-merge.yml b/.github/workflows/submodule-auto-merge.yml index 1046ba2a..3e6f9c99 100644 --- a/.github/workflows/submodule-auto-merge.yml +++ b/.github/workflows/submodule-auto-merge.yml @@ -1,4 +1,4 @@ -name: D2AI auto-merge +name: submodule/font auto-merge on: pull_request permissions: From 81dcd8f0427791e32bca121fbdc4a8149444fd7f Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Tue, 5 Dec 2023 08:07:49 -0700 Subject: [PATCH 7/7] valid syntax --- .github/workflows/submodule-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/submodule-auto-merge.yml b/.github/workflows/submodule-auto-merge.yml index 3e6f9c99..30f9fb06 100644 --- a/.github/workflows/submodule-auto-merge.yml +++ b/.github/workflows/submodule-auto-merge.yml @@ -8,7 +8,7 @@ permissions: jobs: dependabot: runs-on: ubuntu-latest - if: ${{ github.actor == 'd2ai-bot' && github.event.pull_request.title == 'submodule update: generate-font' }} + if: "${{github.actor == 'd2ai-bot' && github.event.pull_request.title == 'submodule update: generate-font'}}" steps: - name: Enable auto-merge for submodule updates run: gh pr merge --auto --merge "$PR_URL"