fixup: ci configs, script error, packcheck commit

composewell · Dec 15, 2023 · a474c7e · a474c7e
1 parent 3db4666
commit a474c7e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -63,7 +63,7 @@ env: &env
       # If you have not committed packcheck.sh in your repo at PACKCHECK
       # then it is automatically pulled from this URL.
       PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-      PACKCHECK_GITHUB_COMMIT: "v0.6.0"
+      PACKCHECK_GITHUB_COMMIT: "3db46664f5eeadcd6fbe18b0ff6e9a31c41e4fbe"
 
     docker:
       - image: debian:latest
@@ -113,12 +113,11 @@ preinstall: &preinstall
           apt-get install -y curl
           CURL=$(which curl)
           PACKCHECK_URL=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT}/packcheck.sh
-          $CURL -sL -o "$PACKCHECK" $PACKCHECK_URL; fi;
+          $CURL -sL -o "$PACKCHECK" $PACKCHECK_URL
           chmod +x $PACKCHECK
-        else if test ! -x "$PACKCHECK"
-          then
+        elif test ! -x "$PACKCHECK"
+        then
             chmod +x $PACKCHECK
-          fi
         fi
 
 restore: &restore

diff --git a/.github/workflows/packcheck.yml b/.github/workflows/packcheck.yml
@@ -85,7 +85,7 @@ jobs:
       # If you have not committed packcheck.sh in your repo at PACKCHECK
       # then it is automatically pulled from this URL.
       PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-      PACKCHECK_GITHUB_COMMIT: "v0.6.0"
+      PACKCHECK_GITHUB_COMMIT: "3db46664f5eeadcd6fbe18b0ff6e9a31c41e4fbe"
 
       # ------------------------------------------------------------------------
       # Final build variables
@@ -161,12 +161,11 @@ jobs:
           apt-get install -y curl
           CURL=$(which curl)
           PACKCHECK_URL=${PACKCHECK_GITHUB_URL}/${PACKCHECK_GITHUB_COMMIT}/packcheck.sh
-          $CURL -sL -o "$PACKCHECK" $PACKCHECK_URL; fi;
+          $CURL -sL -o "$PACKCHECK" $PACKCHECK_URL
           chmod +x $PACKCHECK
-        else if test ! -x "$PACKCHECK"
-          then
+        elif test ! -x "$PACKCHECK"
+        then
             chmod +x $PACKCHECK
-          fi
         fi
 
     - name: Run packcheck

diff --git a/appveyor.yml b/appveyor.yml
@@ -61,7 +61,7 @@ environment:
     # If you have not committed packcheck.sh in your repo at PACKCHECK_LOCAL_PATH
     # then it is automatically pulled from this URL.
     PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
-    PACKCHECK_GITHUB_COMMIT: "v0.6.0"
+    PACKCHECK_GITHUB_COMMIT: "3db46664f5eeadcd6fbe18b0ff6e9a31c41e4fbe"
 
     # Override the temp directory to avoid sed escaping issues
     # See https://github.com/haskell/cabal/issues/5386