Merge branch 'master' of https://forgejo.catcrafts.net/Catcrafts/Crafter.Build

.forgejo/workflows/ci.yaml

@@ -66,25 +66,36 @@ jobs:
       - name: Run tests
         run: CRAFTER_BUILD_HOME=$PWD/share/crafter-build ./bin/crafter-build test
 
+      # Everything below produces release artifacts and only runs on push to
+      # master. PRs stop after the test step above — the bootstrap binary is
+      # enough to validate the change; the per-march variant builds and the
+      # archive uploads are wasted work on a PR.
       - name: Build Linux x86-64-v2 (matches bootstrap)
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         run: CRAFTER_BUILD_HOME=$PWD/share/crafter-build ./bin/crafter-build
 
       - name: Build Linux x86-64-v3
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         run: CRAFTER_BUILD_HOME=$PWD/share/crafter-build CRAFTER_BUILD_MARCH=x86-64-v3 ./bin/crafter-build
 
       - name: Build Linux x86-64-v4
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         run: CRAFTER_BUILD_HOME=$PWD/share/crafter-build CRAFTER_BUILD_MARCH=x86-64-v4 ./bin/crafter-build
 
       - name: Build Windows x86-64-v2 (mingw)
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         run: CRAFTER_BUILD_HOME=$PWD/share/crafter-build ./bin/crafter-build --target=x86_64-w64-mingw32
 
       - name: Build Windows x86-64-v3 (mingw)
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         run: CRAFTER_BUILD_HOME=$PWD/share/crafter-build CRAFTER_BUILD_MARCH=x86-64-v3 ./bin/crafter-build --target=x86_64-w64-mingw32
 
       - name: Build Windows x86-64-v4 (mingw)
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         run: CRAFTER_BUILD_HOME=$PWD/share/crafter-build CRAFTER_BUILD_MARCH=x86-64-v4 ./bin/crafter-build --target=x86_64-w64-mingw32
 
       - name: Package artifacts
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         run: |
           set -eux
           mkdir -p dist
@@ -120,21 +131,27 @@ jobs:
       # so users browsing the PR / run page get six small, individually-named
       # downloads instead of one wrapper zip containing the lot.
       - name: Upload Linux v2 artifact
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         uses: actions/upload-artifact@v3
         with: { name: crafter-build-linux-x86_64-v2, path: dist/crafter-build-linux-x86_64-v2.tar.gz, if-no-files-found: error }
       - name: Upload Linux v3 artifact
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         uses: actions/upload-artifact@v3
         with: { name: crafter-build-linux-x86_64-v3, path: dist/crafter-build-linux-x86_64-v3.tar.gz, if-no-files-found: error }
       - name: Upload Linux v4 artifact
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         uses: actions/upload-artifact@v3
         with: { name: crafter-build-linux-x86_64-v4, path: dist/crafter-build-linux-x86_64-v4.tar.gz, if-no-files-found: error }
       - name: Upload Windows v2 artifact
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         uses: actions/upload-artifact@v3
         with: { name: crafter-build-windows-x86_64-v2, path: dist/crafter-build-windows-x86_64-v2.zip, if-no-files-found: error }
       - name: Upload Windows v3 artifact
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         uses: actions/upload-artifact@v3
         with: { name: crafter-build-windows-x86_64-v3, path: dist/crafter-build-windows-x86_64-v3.zip, if-no-files-found: error }
       - name: Upload Windows v4 artifact
+        if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/master'
         uses: actions/upload-artifact@v3
         with: { name: crafter-build-windows-x86_64-v4, path: dist/crafter-build-windows-x86_64-v4.zip, if-no-files-found: error }
 

implementations/Crafter.Build-External.cpp

@@ -103,9 +103,13 @@ std::string FetchGit(const GitSource& source, const fs::path& cloneDir) {
         }
     }
 
+    // Random per-invocation tmp suffix so concurrent crafter-build processes
+    // resolving to the same cache key don't share an in-flight `.tmp`
+    // directory — git's pack tempfiles would get yanked when one process
+    // removes or renames the dir out from under the other.
+    std::random_device rd;
     fs::path tmpDir = cloneDir;
-    tmpDir += ".tmp";
-    if (fs::exists(tmpDir)) fs::remove_all(tmpDir);
+    tmpDir += std::format(".tmp.{:08x}{:08x}", rd(), rd());
 
     if (auto err = runGit(std::format("git clone --recursive {} {}", ShellQuote(source.url), ShellQuote(tmpDir.string())))) {
         if (fs::exists(tmpDir)) fs::remove_all(tmpDir);
@@ -128,6 +132,10 @@ std::string FetchGit(const GitSource& source, const fs::path& cloneDir) {
     fs::rename(tmpDir, cloneDir, ec);
     if (ec) {
         fs::remove_all(tmpDir);
+        // If a concurrent build won the race, cloneDir now exists with the
+        // same source revision (cache key includes url+branch+commit), so
+        // discard our clone and reuse theirs.
+        if (fs::exists(cloneDir)) return "";
         return std::format("rename {} -> {} failed: {}", tmpDir.string(), cloneDir.string(), ec.message());
     }
     return "";