ci: Fix paths to release binaries

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 926de33c4bb34fb352828a6da6830d2333baf587..c32997e927d3a20e7e909a494a4dc4a945b0a946 100644 (file)
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -304,7 +304,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: linux-aarch64-binary
-          path: install/bin/ccache
+          path: install/ccache
           retention-days: 3
 
   build_linux_x86_64_binary:
@@ -342,7 +342,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: linux-x86_64-binary
-          path: install/bin/ccache
+          path: install/ccache
           retention-days: 3
 
   build_darwin_binary:
@@ -360,7 +360,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: darwin-binary
-          path: install/bin/ccache
+          path: install/ccache
           retention-days: 3
 
   build_windows_binary:
@@ -411,7 +411,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: windows-${{ matrix.arch }}-binary
-          path: install/bin/ccache.exe
+          path: install/ccache.exe
           retention-days: 3
 
   windows_tests:

diff --git a/ci/build-binary b/ci/build-binary
index 2da74555f514df64d5824c2038277d077f8fa961..f519ef679ff6340ecf2e5b94627d5cbc54381b06 100755 (executable)
--- a/ci/build-binary
+++ b/ci/build-binary
@@ -16,4 +16,5 @@ cmake --build .
 DESTDIR=$(pwd)/../install cmake --install . --strip
 
 cd ..
+find install -name 'ccache*' -type f -exec mv '{}' install ';'
 find install -ls

diff --git a/ci/build-darwin-binary b/ci/build-darwin-binary
index 2e4e018dde0d8da97f9d422c7f7c368fc4171627..dd66edf2c589fe7eefcf0a4fb0edc407a5aad656 100755 (executable)
--- a/ci/build-darwin-binary
+++ b/ci/build-darwin-binary
@@ -26,8 +26,8 @@ for i in "$@"; do
     FILES="${FILES} build_$i/ccache"
 done
 
-mkdir -p install/bin
-lipo -create $FILES -output install/bin/ccache
-lipo -info install/bin/ccache
+mkdir -p install
+lipo -create $FILES -output install/ccache
+lipo -info install/ccache
 
 find install -ls

diff --git a/ci/prepare-release b/ci/prepare-release
index 58a2091aa4242400dd2eedf8bad46b471c047853..0588b23d97d01b00737dfcb006a3df8f4cf50d33 100755 (executable)
--- a/ci/prepare-release
+++ b/ci/prepare-release
@@ -32,8 +32,8 @@ prepare_posix_binary_release() {
     chmod +x "${name}/ccache"
     cp misc/Makefile.posix-binary-release "${name}/Makefile"
     cp GPL-3.0.txt README.md "${name}"
-    cp docs/install/share/doc/ccache/* "${name}"
-    cp docs/install/share/man/man1/ccache.1 "${name}"
+    cp docs/install/usr/local/share/doc/ccache/* "${name}"
+    cp docs/install/usr/local/share/man/man1/ccache.1 "${name}"
     tar -caf "release/${name}.tar.${compression}" "${name}"
 }
 
@@ -59,7 +59,7 @@ prepare_windows_binary_release() {
     local name="ccache-${VERSION}-${arch}"
     mkdir "${name}"
     cp "${arch}-binary/ccache.exe" "${name}"
-    cp docs/install/share/doc/ccache/* "${name}"
+    cp "docs/install/usr/local/share/doc/ccache"/* "${name}"
     zip -r "release/${name}.zip" "${name}"
 }