Merge pull request #11630 from DestinyItemManager/gha-composite-and-overhaul

GHA Overhaul

Author: delphiactual

.github/actions/setup-pnpm/action.yml

@@ -0,0 +1,25 @@
+name: 'Setup PNPM Environment'
+description: 'Setup Node.js with PNPM and install dependencies with proper caching'
+
+inputs:
+  install:
+    description: 'Whether to install dependencies (default: true)'
+    required: false
+    default: 'true'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Setup pnpm
+      uses: pnpm/action-setup@v4
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v6
+      with:
+        node-version-file: '.nvmrc'
+        cache: 'pnpm'  # This caches the pnpm store automatically
+
+    - name: Install dependencies
+      if: inputs.install == 'true'
+      shell: bash
+      run: pnpm install --frozen-lockfile --prefer-offline

.github/workflows/auto-merge.yml

@@ -0,0 +1,40 @@
+name: Auto-merge
+
+on:
+  pull_request_target:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  auto-merge:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    if: github.actor == 'd2ai-bot' || github.actor == 'dependabot[bot]'
+    steps:
+      - name: Generate token
+        uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ secrets.AUTOMERGE_APP_ID }}
+          private-key: ${{ secrets.AUTOMERGE_PRIVATE_KEY }}
+
+      - name: Dependabot metadata
+        if: github.actor == 'dependabot[bot]'
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+
+      - name: Enable auto-merge for d2ai PRs
+        if: github.actor == 'd2ai-bot'
+        run: gh pr merge --auto --merge "${{ github.event.pull_request.html_url }}"
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+
+      - name: Enable auto-merge for Dependabot PRs
+        if: github.actor == 'dependabot[bot]' && (steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor')
+        run: gh pr merge --auto --merge "${{ github.event.pull_request.html_url }}"
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/changelog-updater.yml

@@ -12,20 +12,17 @@ permissions:
 jobs:
   update-changelog:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@v6
         with:
           token: ${{ secrets.I18N_PAT }}
 
-      - uses: pnpm/action-setup@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
+      - uses: ./.github/actions/setup-pnpm
         with:
-          node-version-file: '.nvmrc'
+          install: 'false'  # Don't need dependencies for this script
 
       - name: Update changelog from commits
-        id: changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ github.repository }}

.github/workflows/d2ai-auto-merge.yml

@@ -22,13 +22,7 @@ jobs:
         with:
           fetch-depth: 2 # So sentry can get the previous commit
 
-      - uses: pnpm/action-setup@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-          cache: pnpm
+      - uses: ./.github/actions/setup-pnpm
 
       - name: Install SSH key
         uses: benoitchantre/[email protected]
@@ -37,11 +31,11 @@ jobs:
           private-key-name: dim.rsa
           known-hosts: ${{ secrets.REMOTE_HOST }}
 
-      - name: get-npm-version
+      - name: Get package version
         id: package-version
         uses: martinbeentjes/[email protected]
 
-      - name: set beta
+      - name: Set beta environment
         run: |
           echo "build_level='beta'" >> $GITHUB_ENV
 
@@ -51,9 +45,6 @@ jobs:
         run: |
           echo "VERSION=${{ steps.package-version.outputs.current-version }}.$(($RUN_NUM))" >> $GITHUB_ENV
 
-      - name: Install
-        run: pnpm install --frozen-lockfile --prefer-offline
-
       - name: Build
         run: pnpm build:beta
         env:
@@ -63,9 +54,8 @@ jobs:
           WEB_OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_SECRET }}
           DIM_API_KEY: ${{ secrets.DIM_API_KEY }}
 
-      # Send webpack stats and build information to RelativeCI
-      - name: Send bundle stats and build information to RelativeCI
-        uses: relative-ci/[email protected]
+      - name: Send bundle stats to RelativeCI
+        uses: relative-ci/agent-action@v3
         with:
           key: ${{ secrets.RELATIVE_CI_KEY }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -77,11 +67,11 @@ jobs:
       - name: Rsync to Server
         run: ./build/rsync-deploy.sh
         env:
-            SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY }}
-            SOURCE: "dist/"
-            REMOTE_USER: ${{ secrets.REMOTE_USER }}
-            REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
-            REMOTE_PATH: beta.destinyitemmanager.com
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_KEY }}
+          SOURCE: "dist/"
+          REMOTE_USER: ${{ secrets.REMOTE_USER }}
+          REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
+          REMOTE_PATH: beta.destinyitemmanager.com
 
       - name: Purge CloudFlare cache
         run: ./build/purge-cloudflare.sh

.github/workflows/dependabot-auto-merge.yml

@@ -11,7 +11,7 @@ on:
   schedule:
     # Deploy at 5pm Sunday PST, which is 1am Monday UTC
     # * is a special character in YAML so you have to quote this string
-    - cron:  '0 1 * * 1'
+    - cron: '0 1 * * 1'
 
 jobs:
   deploy:
@@ -26,13 +26,7 @@ jobs:
           # Use the dim-release-bot token rather than the default
           token: ${{ secrets.GH_TOKEN }}
 
-      - uses: pnpm/action-setup@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-          cache: pnpm
+      - uses: ./.github/actions/setup-pnpm
 
       - name: Install SSH key
         uses: benoitchantre/[email protected]
@@ -41,9 +35,6 @@ jobs:
           private-key-name: dim.rsa
           known-hosts: ${{ secrets.REMOTE_HOST }}
 
-      - name: Install
-        run: pnpm install --frozen-lockfile --prefer-offline
-
       - name: Build and deploy
         run: ./build/deploy-prod.sh
         env:
@@ -67,7 +58,7 @@ jobs:
           CLOUDFLARE_EMAIL: ${{ secrets.CLOUDFLARE_EMAIL }}
           APP_DOMAIN: app.destinyitemmanager.com
 
-      - name: get-npm-version
+      - name: Get package version
         id: package-version
         shell: bash
         run: |

.github/workflows/deploy-beta.yml

@@ -1,29 +1,23 @@
 # This workflow runs every Saturday @ 1900 UTC (NOON PST)
 name: i18n download bot
+
 on:
   workflow_dispatch:
   schedule:
     - cron: "0 19 * * 6"
+
 jobs:
-  build:
+  download:
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     steps:
       - name: Checkout DIM
         uses: actions/checkout@v6
         with:
           ref: ${{ github.head_ref }}
           token: ${{ secrets.I18N_PAT }}
 
-      - uses: pnpm/action-setup@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-          cache: pnpm
-
-      - name: Install
-        run: pnpm install --frozen-lockfile --prefer-offline
+      - uses: ./.github/actions/setup-pnpm
 
       - name: Download updated i18n files
         uses: crowdin/[email protected]
@@ -40,17 +34,17 @@ jobs:
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: sort locale json
+      - name: Sort locale JSON files
         run: |
           allLocales=("en" "de" "es" "esMX" "fr" "it" "ja" "ko" "pl" "ptBR" "ru" "zhCHS" "zhCHT")
           for lang in ${allLocales[@]}; do
             jq -S . src/locale/$lang.json > src/locale/sorted_$lang.json && mv src/locale/sorted_$lang.json src/locale/$lang.json
           done
 
-      - name: build browsercheck utils
+      - name: Build browsercheck utils
         run: pnpm bcu
 
-      - name: porcelain check
+      - name: Check for changes
         uses: dorny/paths-filter@v3
         id: filter
         with:
@@ -60,10 +54,10 @@ jobs:
               - '**'
 
       - name: Commit files
-        if: steps.filter.outputs.changed
+        if: steps.filter.outputs.changed == 'true'
         uses: stefanzweifel/git-auto-commit-action@v7
         with:
-          commit_message: i18n
+          commit_message: "i18n: Update translations from Crowdin"
           commit_user_name: DIM i18n Bot
           commit_user_email: [email protected]
-          commit_author: DIM i18n Bot <[email protected]>
+          commit_author: DIM i18n Bot <[email protected]>

.github/workflows/deploy-prod.yml

@@ -1,7 +1,7 @@
 # This workflow runs whenever locale/en.json is updated on the master branch
 # It updates crowdin with new translation strings
-# and notifies the #i18n @i18n in Discord of the new translations.
 name: i18n upload bot
+
 on:
   workflow_dispatch:
   push:
@@ -10,7 +10,7 @@ on:
     branches: [master]
 
 jobs:
-  build:
+  upload:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout DIM
@@ -31,7 +31,7 @@ jobs:
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: porcelain check
+      - name: Check for changes
         uses: dorny/paths-filter@v3
         id: filter
         with:

.github/workflows/i18n-bot-download.yml

@@ -8,30 +8,20 @@ on:
       - 'src/locale/en.json'
 
 jobs:
-  i18n-update:
+  update:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 3
           token: ${{ secrets.I18N_PAT }}
 
-      - uses: pnpm/action-setup@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v6
-        with:
-          node-version-file: '.nvmrc'
-          cache: pnpm
-
-      - name: Install
-        run: pnpm install --frozen-lockfile --prefer-offline
+      - uses: ./.github/actions/setup-pnpm
 
-      - name: pnpm i18n
+      - name: Run i18n update
         run: pnpm i18n
 
       - name: Commit files
         uses: stefanzweifel/git-auto-commit-action@v7
         with:
-          commit_message: Apply i18n updates
+          commit_message: "i18n: Apply automated updates"