Remove package sources and host only the expected SHA-256 (#3)

Reviewed-on: #3 Co-authored-by: Scott E. Graves <scott.e.graves@protonmail.com> Co-committed-by: Scott E. Graves <scott.e.graves@protonmail.com>
2025-12-13 09:35:33 -06:00
parent 5cf3d1661b
commit ba5f4d1625
73 changed files with 496 additions and 209 deletions
--- a/src/.jenkins_msys2
+++ b/src/.jenkins_msys2
@@ -0,0 +1,77 @@
+#!groovy
+
+pipeline {
+  agent none
+
+  environment {
+    PROJECT_TEST_CONFIG_DIR = "c:\\.ci\\%PROJECT_NAME%\\test"
+  }
+
+  options {
+    disableConcurrentBuilds()
+    skipDefaultCheckout()
+    timestamps()
+  }
+
+  stages {
+    // stage('Build • Test • Deliver')
+    stage('Build • Test') {
+      agent any
+      stages {
+        stage('Checkout') {
+          steps {
+            script {
+              int maxAttempts = 6
+              int baseDelay   = 10
+              for (int attempt = 1; attempt <= maxAttempts; attempt++) {
+                try {
+                  checkout scm
+                  break
+                } catch (err) {
+                  if (attempt == maxAttempts) { throw err }
+                  int waitSec = baseDelay * (1 << (attempt - 1))
+                  echo "Checkout failed (attempt ${attempt}/${maxAttempts}). Waiting ${waitSec}s before retry..."
+                  sleep time: waitSec, unit: 'SECONDS'
+                }
+              }
+            }
+          }
+        }
+
+        stage('msys2_x86_64') {
+          steps { script { retryWithBackoff(2, 5) { bat 'scripts\\make_win32.cmd x86_64' } } }
+        }
+
+        stage('test') {
+          steps {
+            script {
+              retryWithBackoff(2, 5) { bat 'scripts\\run_tests.cmd x86_64' }
+            }
+          }
+        }
+
+        // stage('deliver') {
+        //   steps {
+        //     script {
+        //       retryWithBackoff(3, 10) { bat 'scripts\\deliver.cmd C:\\deliver\\%PROJECT_NAME% "" x86_64' }
+        //     }
+        //   }
+        // }
+      }
+    }
+  }
+}
+
+def retryWithBackoff(int maxAttempts, int baseDelaySeconds, Closure body) {
+  for (int attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      body()
+      return
+    } catch (err) {
+      if (attempt == maxAttempts) { throw err }
+      int waitSec = baseDelaySeconds * (1 << (attempt - 1))
+      echo "Step failed (attempt ${attempt}/${maxAttempts}). Waiting ${waitSec}s before retry..."
+      sleep time: waitSec, unit: 'SECONDS'
+    }
+  }
+}
--- a/src/scripts/cleanup.cmd
+++ b/src/scripts/cleanup.cmd
@@ -6,6 +6,6 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./cleanup.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd
--- a/src/scripts/deliver.cmd
+++ b/src/scripts/deliver.cmd
@@ -8,6 +8,6 @@ set ARG1=%~3
 set ARG2=%~4
 set ARG3=%~5

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./deliver.sh "%DEST%" "%DIST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd
--- a/src/scripts/deliver.sh
+++ b/src/scripts/deliver.sh
@@ -7,6 +7,11 @@ PROJECT_SCRIPTS_DIR=$(realpath "$0")
 PROJECT_SCRIPTS_DIR=$(dirname "${PROJECT_SCRIPTS_DIR}")
 . "${PROJECT_SCRIPTS_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"

+COPY_OPS=-f
+if [ "${PROJECT_IS_DARWIN}" == "1" ]; then
+  COPY_OPS="${COPY_OPS} -X"
+fi
+
 function error_exit() {
  echo $1
  exit $2
@@ -38,13 +43,16 @@ BRANCH=$(git branch --show-current)
 RELEASE=$(grep PROJECT_RELEASE_ITER= ./config.sh | ${SED} s/PROJECT_RELEASE_ITER=//g)
 popd

-if [ "${BRANCH}" == "master" ] || [ "${BRANCH}" == "alpha" ] ||
-  [ "${BRANCH}" == "main" ] || [ "${BRANCH}" == "release" ] ||
-  [ "${BRANCH}" == "beta" ] || [ "${BRANCH}" == "rc" ]; then
-  DEST_DIR=${DEST_DIR}/${RELEASE}
-elif [[ ${BRANCH} = *'-alpha-'* ]] || [[ ${BRANCH} = *'-beta-'* ]] ||
-  [[ ${BRANCH} = *'-rc-'* ]] || [[ ${BRANCH} = *'-release-'* ]]; then
-  DEST_DIR=${DEST_DIR}/nightly
+if [[ "${BRANCH}" =~ ^(master|main|release)$ ]] ||
+  [[ "${BRANCH}" =~ ^(alpha|beta|rc)(\.[0-9]+)?$ ]]; then
+  DEST_DIR="${DEST_DIR}/$([[ "${BRANCH}" =~ ^(master|main|release)$ ]] &&
+    printf '%s' "${RELEASE}" ||
+    printf '%s' "${BRANCH%%.*}")"
+elif [[ "${BRANCH}" == *"-alpha-"* ]] || [[ "${BRANCH}" == *"-beta-"* ]] ||
+  [[ "${BRANCH}" == *"-rc-"* ]] || [[ "${BRANCH}" == *"-release-"* ]] ||
+  [[ "${BRANCH}" == *"-alpha."* ]] || [[ "${BRANCH}" == *"-beta."* ]] ||
+  [[ "${BRANCH}" == *"-rc."* ]]; then
+  DEST_DIR="${DEST_DIR}/nightly"
 else
  error_exit "skipping ${PROJECT_FILE_PART}" 0
 fi
@@ -62,39 +70,39 @@ if [ "${PROJECT_PRIVATE_KEY}" != "" ] && [ ! -f "./${PROJECT_OUT_FILE}.sig" ]; t
  error_exit "failed to find file: ${PROJECT_OUT_FILE}.sig" 1
 fi

-cp -f ./${PROJECT_OUT_FILE} ${DEST_DIR} ||
+cp ${COPY_OPS} ./${PROJECT_OUT_FILE} ${DEST_DIR} ||
  error_exit "failed to deliver file: ${PROJECT_OUT_FILE}" 1

-cp -f ./${PROJECT_OUT_FILE}.sha256 ${DEST_DIR} ||
+cp ${COPY_OPS} ./${PROJECT_OUT_FILE}.sha256 ${DEST_DIR} ||
  error_exit "failed to deliver file: ${PROJECT_OUT_FILE}.sha256" 1

 if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-  cp -f ./${PROJECT_OUT_FILE}.sig ${DEST_DIR} ||
+  cp ${COPY_OPS} ./${PROJECT_OUT_FILE}.sig ${DEST_DIR} ||
    error_exit "failed to deliver file: ${PROJECT_OUT_FILE}.sig" 1
 fi

 if [ "${PROJECT_IS_MINGW}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe" ]; then
-  cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe" ${DEST_DIR} ||
    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}" 1

-  cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" ${DEST_DIR} ||
    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sha256" 1

  if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-    cp -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sig" ${DEST_DIR} ||
+    cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sig" ${DEST_DIR} ||
      error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}_setup.exe.sig" 1
  fi
 fi

 if [ "${PROJECT_IS_DARWIN}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ]; then
-  cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" ${DEST_DIR} ||
    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg" 1

-  cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" ${DEST_DIR} ||
+  cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" ${DEST_DIR} ||
    error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sha256" 1

  if [ "${PROJECT_PRIVATE_KEY}" != "" ]; then
-    cp -f -X "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" ${DEST_DIR} ||
+    cp ${COPY_OPS} "${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" ${DEST_DIR} ||
      error_exit "failed to deliver file: ${PROJECT_DIST_DIR}/${PROJECT_FILE_PART}.dmg.sig" 1
  fi
 fi
--- a/src/scripts/info.cmd
+++ b/src/scripts/info.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./info.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd

--- a/src/scripts/make_package.cmd
+++ b/src/scripts/make_package.cmd
@@ -6,6 +6,6 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./make_package.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1
 popd
--- a/src/scripts/make_win32.cmd
+++ b/src/scripts/make_win32.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call setup_msys2.cmd "%ARG1%" "%ARG2%" "%ARG3%"
  if exist "cleanup.cmd" (
    call cleanup.cmd "%ARG1%" "%ARG2%" "%ARG3%" 1 0
--- a/src/scripts/run_tests.cmd
+++ b/src/scripts/run_tests.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./run_tests.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd

--- a/src/scripts/setup_msys2.cmd
+++ b/src/scripts/setup_msys2.cmd
@@ -6,7 +6,7 @@ set ARG1=%~1
 set ARG2=%~2
 set ARG3=%~3

-pushd "%~dp0%"
+pushd "%~dp0"
  call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0
  call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 
 popd
--- a/src/scripts/setup_msys2.sh
+++ b/src/scripts/setup_msys2.sh
@@ -14,6 +14,7 @@ PROJECT_MSYS2_PACKAGE_LIST+=(
  mingw64/mingw-w64-x86_64-diffutils
  mingw64/mingw-w64-x86_64-gcc
  mingw64/mingw-w64-x86_64-gdb
+  mingw64/mingw-w64-x86_64-git-lfs
  mingw64/mingw-w64-x86_64-icu
  mingw64/mingw-w64-x86_64-make
  mingw64/mingw-w64-x86_64-mesa