Merge remote-tracking branch 'upstream/master'

jeremyd2019 · Jan 18, 2022 · 02fd9be · 02fd9be
2 parents 305698e + 1092590
commit 02fd9be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/.ci/Dockerfile.2016 b/.ci/Dockerfile.2016
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on:
   #pull_request:
   workflow_dispatch:
   #schedule:
-  #  - cron: '0 3 * * 1,4'
+  #  - cron: '0 3 * * *'
 
 concurrency: nope
 
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: [2016, 2019, 2022]
+        image: [2019, 2022]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -92,7 +92,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: [2016, 2019, 2022]
+        image: [2019, 2022]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

diff --git a/make-msys2-installer b/make-msys2-installer
@@ -74,6 +74,7 @@ create_archives() {
   popd > /dev/null
 
   pushd ${_newmsysbase} > /dev/null
+    export XZ_OPT="-e9T0"
     local _compress_cmd2="/usr/bin/tar --transform='s/:/_/g' --dereference --hard-dereference -cJf ${_thisdir}/${_filename2} msys${_bitness}"
     echo "Run: ${_compress_cmd2} ..." | tee -a ${_log}
     eval "${_compress_cmd2}" 2>&1 | tee -a ${_log}