config: Update 3 files
Some checks failed
Build-Test-Publish / build (linux/amd64) (push) Failing after 7s
Build-Test-Publish / build (linux/arm64) (push) Failing after 7s
Build-Test-Publish / test-install-from-scratch (linux/amd64) (push) Has been skipped
Build-Test-Publish / test-install-from-scratch (linux/arm64) (push) Has been skipped

This commit is contained in:
Your Name
2025-06-29 22:14:13 +12:00
parent fe3c5d2ad9
commit 2f056b8500
3 changed files with 24 additions and 15 deletions

View File

@ -26,7 +26,10 @@ jobs:
password: ${{ secrets.DOCKER_PUSH_TOKEN }} password: ${{ secrets.DOCKER_PUSH_TOKEN }}
- name: Build Test Publish All - name: Build Test Publish All
run: | run: |
SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} RELEASE_WRITE_TOKEN=${{ secrets.RELEASE_WRITE_TOKEN }} ./buildtestpublish_all.sh SOS_WRITE_TOKEN=${{ secrets.SOS_WRITE_TOKEN }} \
RELEASE_WRITE_TOKEN=${{ secrets.RELEASE_WRITE_TOKEN }} \
GITEA_CONTAINER_NAME=${{ env.JOB_CONTAINER_NAME }} \
./buildtestpublish_all.sh
test-install-from-scratch: test-install-from-scratch:
needs: [build] needs: [build]

View File

@ -13,20 +13,23 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
# Debug output for CI # Debug output for CI
echo "${PROJECT} build script running from: ${SCRIPT_DIR}" echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
mkdir -p "./build" mkdir -p "${SCRIPT_DIR}/build"
mkdir -p "./output" mkdir -p "${SCRIPT_DIR}/output"
# Run build in container with mounted directories # Run build in container with mounted directories
docker run --rm \ docker run --rm \
--user "$(id -u):$(id -g)" \ --user "$(id -u):$(id -g)" \
-v ".:/app" \ ${GITEA_CONTAINER_NAME:+--volumes-from ${GITEA_CONTAINER_NAME}} \
-v "${SCRIPT_DIR}:/app:ro" \
-v "${SCRIPT_DIR}/build:/build" \
-v "${SCRIPT_DIR}/output:/output" \
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \ -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
gitea.jde.nz/public/dropshell-build-base:latest \ gitea.jde.nz/public/dropshell-build-base:latest \
bash -c " bash -c "
cd /app && ls -la && \ cd /build && \
cmake -G Ninja -S /app -B /app/build \ cmake -G Ninja -S /app -B . \
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
-DPROJECT_NAME=${PROJECT} && \ -DPROJECT_NAME=${PROJECT} && \
cmake --build /app/build && \ cmake --build . && \
cp /app/build/${PROJECT} /app/output/ cp ${PROJECT} /output/
" "

View File

@ -13,20 +13,23 @@ PROJECT="$(basename "$(dirname "${SCRIPT_DIR}")")"
# Debug output for CI # Debug output for CI
echo "${PROJECT} build script running from: ${SCRIPT_DIR}" echo "${PROJECT} build script running from: ${SCRIPT_DIR}"
mkdir -p "./build" mkdir -p "${SCRIPT_DIR}/build"
mkdir -p "./output" mkdir -p "${SCRIPT_DIR}/output"
# Run build in container with mounted directories # Run build in container with mounted directories
docker run --rm \ docker run --rm \
--user "$(id -u):$(id -g)" \ --user "$(id -u):$(id -g)" \
-v ".:/app" \ ${GITEA_CONTAINER_NAME:+--volumes-from ${GITEA_CONTAINER_NAME}} \
-v "${SCRIPT_DIR}:/app:ro" \
-v "${SCRIPT_DIR}/build:/build" \
-v "${SCRIPT_DIR}/output:/output" \
-e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \ -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Debug}" \
gitea.jde.nz/public/dropshell-build-base:latest \ gitea.jde.nz/public/dropshell-build-base:latest \
bash -c " bash -c "
cd /app && ls -la && \ cd /build && \
cmake -G Ninja -S /app -B /app/build \ cmake -G Ninja -S /app -B . \
-DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=\${CMAKE_BUILD_TYPE} \
-DPROJECT_NAME=${PROJECT} && \ -DPROJECT_NAME=${PROJECT} && \
cmake --build /app/build && \ cmake --build . && \
cp /app/build/${PROJECT} /app/output/ cp ${PROJECT} /output/
" "