Merge pull request #14 from kurone-kito/cumulative-updates

kurone-kito · web-flow · commit 0b77a6084c74 · 2025-06-23T08:51:11.000+09:00
Cumulative updates
diff --git a/.github/workflows/build-listing.yml b/.github/workflows/build-listing.yml
@@ -1,9 +1,4 @@
 name: Build Repo Listing
-
-env:
-  listPublishDirectory: Website
-  pathToCi: ci
-
 on:
   release:
     types:
@@ -22,6 +17,7 @@ on:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
+  actions: write
   contents: read
   id-token: write
   pages: write
@@ -32,14 +28,15 @@ concurrency:
   group: pages
 
 jobs:
-  build:
+  website:
+    secrets: inherit
     uses: ./.github/workflows/build-website.yml
     with:
       listPublishDirectory: Website
       pathToCi: ci
 
   deploy:
-    needs: build
+    needs: website
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
@@ -49,6 +46,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: listing-site
+          path: Website
       - name: Prepare for GitHub Pages deployment
         uses: actions/configure-pages@v5
         with:
@@ -57,7 +55,7 @@ jobs:
       - name: Upload the VPM Listing Website to GitHub Pages artifacts
         uses: actions/upload-pages-artifact@v3
         with:
-          path: ${{ env.listPublishDirectory }}
+          path: Website
       - id: deployment
         name: Deploy the uploaded VPM Listing Website to GitHub Pages
         uses: actions/deploy-pages@v4
diff --git a/.github/workflows/build-website.yml b/.github/workflows/build-website.yml
@@ -26,16 +26,6 @@ jobs:
     steps:
       - name: Checkout Local Repository
         uses: actions/checkout@v4
-      - name: Download package archive
-        if: inputs.zipFile != ''
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ inputs.zipFile }}
-      - name: Download UnityPackage
-        if: inputs.unityPackage != ''
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ inputs.unityPackage }}
       - name: Checkout Automation Repository without removing prior checkouts
         uses: actions/checkout@v4
         with:
@@ -51,13 +41,16 @@ jobs:
           path: |
             ${{ inputs.pathToCi }}/.nuke/temp
             ~/.nuget/packages
+          restore-keys: |
+            ${{ runner.os }}-
       - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         name: Build Package Version Listing with Nuke
         run: '"${{ inputs.pathToCi }}/build.cmd" BuildRepoListing --root "${{ inputs.pathToCi }}" --list-publish-directory "$GITHUB_WORKSPACE/${{ inputs.listPublishDirectory }}" --current-package-name "${{ vars.PACKAGE_NAME }}"'
       - name: Upload listing artifact
         uses: actions/upload-artifact@v4
         with:
+          if-no-files-found: error
           name: listing-site
           path: ${{ inputs.listPublishDirectory }}
           retention-days: 1
diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml
@@ -19,7 +19,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Local Repository
+        uses: actions/checkout@v4
       - name: Zip the Package
         run: zip -r -9 "${{ github.workspace }}/${{ inputs.zipFile }}" .
         working-directory: "${{ inputs.packagePath }}"
@@ -33,12 +34,14 @@ jobs:
       - name: Upload package archive
         uses: actions/upload-artifact@v4
         with:
+          if-no-files-found: error
           name: ${{ inputs.zipFile }}
           path: ${{ inputs.zipFile }}
           retention-days: 1
       - name: Upload UnityPackage
         uses: actions/upload-artifact@v4
         with:
+          if-no-files-found: error
           name: ${{ inputs.unityPackage }}
           path: ${{ inputs.unityPackage }}
           retention-days: 1
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,29 +1,38 @@
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 name: The CI workflow on push
 on:
   push:
     branches:
       - '*'
       - '!main'
-permissions:
-  actions: write
-  contents: read
+  pull_request:
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Local Repository
+        uses: actions/checkout@v4
       - name: Run cspell
         uses: streetsidesoftware/cspell-action@v7
       - name: Run markdownlint
         uses: DavidAnson/markdownlint-cli2-action@v20
   package:
+    permissions:
+      actions: write
+      contents: read
+    secrets: inherit
     uses: ./.github/workflows/package-build.yml
     with:
       packagePath: Packages/${{ vars.PACKAGE_NAME }}
       unityPackage: ${{ vars.PACKAGE_NAME }}-feature.unitypackage
       zipFile: ${{ vars.PACKAGE_NAME }}-feature.zip
-  build:
+  website:
     needs: package
+    permissions:
+      actions: write
+      contents: read
     uses: ./.github/workflows/build-website.yml
     with:
       listPublishDirectory: Website
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,3 +1,6 @@
+concurrency:
+  group: release-${{ github.ref }}
+  cancel-in-progress: true
 name: Build Release
 
 on:
@@ -21,7 +24,7 @@ jobs:
           fi
 
   prepare:
-    if: needs.config.outputs.config_package == 'true'
+    if: ${{ needs.config.outputs.config_package == 'true' }}
     needs: config
     outputs:
       stableVersion: ${{ steps.resolve.outputs.stableVersion }}
@@ -30,7 +33,8 @@ jobs:
       zipFile: ${{ steps.resolve.outputs.zipFile }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout Local Repository
+        uses: actions/checkout@v4
       - id: version
         name: Get the Package version based on the package.json file
         # cspell: disable-next-line
@@ -54,24 +58,21 @@ jobs:
           echo "zipFile=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}.zip" >> $GITHUB_OUTPUT
 
   package:
-    if: needs.config.outputs.config_package == 'true'
+    if: ${{ needs.config.outputs.config_package == 'true' }}
     needs:
       - config
       - prepare
+    secrets: inherit
     uses: ./.github/workflows/package-build.yml
     with:
       packagePath: Packages/${{ vars.PACKAGE_NAME }}
       unityPackage: ${{ needs.prepare.outputs.unityPackage }}
       zipFile: ${{ needs.prepare.outputs.zipFile }}
 
-  build:
+  release:
     env:
       packagePath: Packages/${{ vars.PACKAGE_NAME }}
-      stableVersion: ${{ needs.prepare.outputs.stableVersion }}
-      unityPackage: ${{ needs.prepare.outputs.unityPackage }}
-      version: ${{ needs.prepare.outputs.version }}
-      zipFile: ${{ needs.prepare.outputs.zipFile }}
-    if: needs.config.outputs.config_package == 'true'
+    if: ${{ needs.config.outputs.config_package == 'true' }}
     needs:
       - config
       - prepare
@@ -91,38 +92,37 @@ jobs:
       - name: Download package archive
         uses: actions/download-artifact@v4
         with:
-          name: ${{ env.zipFile }}
+          name: ${{ needs.prepare.outputs.zipFile }}
       - name: Download UnityPackage
         uses: actions/download-artifact@v4
         with:
-          name: ${{ env.unityPackage }}
+          name: ${{ needs.prepare.outputs.unityPackage }}
       - name: copy the README and LICENSE files to the Package folder
         run: cp README.md LICENSE "${{ env.packagePath }}"
       - name: Zip the UnityPackage for release
-        run: zip -r -9 "${{ env.unityPackage }}.zip" "${{ env.unityPackage }}" LICENSE README.md
+        run: zip -r -9 "${{ needs.prepare.outputs.unityPackage }}.zip" "${{ needs.prepare.outputs.unityPackage }}" LICENSE README.md
       - name: Sign the artifacts
         run: |
-          gpg --batch --pinentry-mode loopback --passphrase "${{ secrets.GPG_PASSPHRASE }}" -ab "${{ env.zipFile }}"
-          gpg --batch --pinentry-mode loopback --passphrase "${{ secrets.GPG_PASSPHRASE }}" -ab "${{ env.unityPackage }}"
-          gpg --batch --pinentry-mode loopback --passphrase "${{ secrets.GPG_PASSPHRASE }}" -ab "${{ env.unityPackage }}.zip"
+          gpg --batch --pinentry-mode loopback --passphrase "${{ secrets.GPG_PASSPHRASE }}" -ab "${{ needs.prepare.outputs.zipFile }}"
+          gpg --batch --pinentry-mode loopback --passphrase "${{ secrets.GPG_PASSPHRASE }}" -ab "${{ needs.prepare.outputs.unityPackage }}"
+          gpg --batch --pinentry-mode loopback --passphrase "${{ secrets.GPG_PASSPHRASE }}" -ab "${{ needs.prepare.outputs.unityPackage }}.zip"
       - id: tag_version
         name: Create a release tag of the version from the package.json file
         # cspell: disable-next-line
         uses: rickstaa/action-create-tag@v1
         with:
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          tag: "${{ env.version }}"
+          tag: "${{ needs.prepare.outputs.version }}"
       - name: Publish the Release to GitHub
         uses: softprops/action-gh-release@v2
         with:
           files: |
-            ${{ env.zipFile }}
-            ${{ env.zipFile }}.asc
-            ${{ env.unityPackage }}
-            ${{ env.unityPackage }}.asc
-            ${{ env.unityPackage }}.zip
-            ${{ env.unityPackage }}.zip.asc
+            ${{ needs.prepare.outputs.zipFile }}
+            ${{ needs.prepare.outputs.zipFile }}.asc
+            ${{ needs.prepare.outputs.unityPackage }}.asc
+            ${{ needs.prepare.outputs.unityPackage }}.zip
+            ${{ needs.prepare.outputs.unityPackage }}.zip.asc
             ${{ env.packagePath }}/package.json
-          prerelease: ${{ env.stableVersion == '' }}
-          tag_name: ${{ env.version }}
+          prerelease: ${{ needs.prepare.outputs.stableVersion == '' }}
+          tag_name: ${{ needs.prepare.outputs.version }}
diff --git a/README.md b/README.md
@@ -70,6 +70,11 @@ Make sure you are creating a **repository variable**, and not a
      - **Name**: `PACKAGE_NAME`
      - **Value**: the name of your package, like `com.vrchat.demo-template`.
 
+Workflows triggered by `pull_request` events also read this variable. Pull
+requests from forks do not have access to repository variables, so the CI
+may fail unless the pull request originates from a branch in the same
+repository.
+
 Finally, go to the "Settings" page for your repo, then choose "Pages", and
 look for the heading "Build and deployment". Change the "Source" dropdown
 from "Deploy from a branch" to "GitHub Actions".
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "rollForward": "latestMinor",
+    "rollForward": "minor",
     "version": "8.0.411"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "rollForward": "latestMinor",`
	`3`	`+ "rollForward": "minor",`
`4`	`4`	`"version": "8.0.411"`
`5`	`5`	`}`
`6`	`6`	`}`