Merge branch 'dockcross:master' into master

.github/workflows/expired.yml

@@ -1,7 +1,7 @@
 name: 'Close stale issues and PRs'
 on:
   schedule:
-    - cron: '* * */1 * *'
+    - cron: '0 */8 * * *'
 jobs:
   stale:
     runs-on: ubuntu-latest
@@ -12,10 +12,10 @@ jobs:
           exempt-issue-milestones: 'future,alpha,beta,release'
           exempt-pr-milestones: 'bugfix,improvement'
           exempt-all-pr-assignees: true
-          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
-          stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
-          close-issue-message: 'This issue was closed because it has been stalled for 15 days with no activity.'
-          close-pr-message: 'This PR was closed because it has been stalled for 15 days with no activity.'
+          stale-issue-message: 'This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
+          stale-pr-message: 'This PR is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
+          close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
+          close-pr-message: 'This PR was closed because it has been stalled for 30 days with no activity.'
           days-before-issue-stale: 120
           days-before-pr-stale: 120
           days-before-issue-close: 30

.github/workflows/main.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   base:
     name: base
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: build
@@ -26,7 +26,7 @@ jobs:
       - name: archive base
         run: |
             mkdir -p cache
-            docker save -o ./cache/base.tar dockcross/base:latest
+            docker save dockcross/base:latest | xz -e9 -T0 > ./cache/base.tar.xz
       - name: save base
         uses: actions/upload-artifact@v2
         with:
@@ -54,7 +54,7 @@ jobs:
           name: cache
           path: ./cache
       - name: load base
-        run: docker load -i ./cache/base.tar
+        run: xz -d -k < ./cache/base.tar.xz | docker load
       - name: build
         run: make ${{ matrix.arch_name }}
       - name: test

imagefiles/install-crosstool-ng-toolchain.sh

@@ -79,6 +79,9 @@ if [ ${REV} = "crosstool-ng-1.23.0" ]; then
   patch scripts/build/companion_libs/210-expat.sh -i /dockcross/crosstool-ng-expat.patch
   # Patch to fix error with bash 5 and up: https://github.com/pfalcon/esp-open-sdk/issues/365
   patch configure.ac -i /dockcross/Fix-error-with-bash-5-and-up.patch
+  # Clean patch
+  rm /dockcross/Fix-error-with-bash-5-and-up.patch
+  rm /dockcross/crosstool-ng-expat.patch
 fi
 
 # Bootstrap and install the tool.

imagefiles/install-python-packages.sh

@@ -29,3 +29,5 @@ rm get-pip.py
 
 ${PYTHON} -m pip install --upgrade --ignore-installed setuptools
 ${PYTHON} -m pip install --ignore-installed conan
+# Purge cache to save space: https://stackoverflow.com/questions/37513597/is-it-safe-to-delete-cache-pip-directory
+${PYTHON} -m pip cache purge

tools/container-diff.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -euo pipefail
+
+# More info: https://github.com/GoogleContainerTools/container-diff
+
+if (( $# < 1 || $# > 2  )); then
+    echo "Need 1 or 2 arguments: <img1> <img2>"
+    exit 1
+fi
+
+if (( $# == 1 )); then
+    container-diff analyze $1 --type=history 2>&1 | tee -a analyze-history.txt
+    container-diff analyze $1 --type=file 2>&1 | tee -a analyze-file.txt
+    container-diff analyze $1 --type=size 2>&1 | tee -a analyze-size.txt
+    container-diff analyze $1 --type=apt 2>&1 | tee -a analyze-apt.txt
+    container-diff analyze $1 --type=pip 2>&1 | tee -a analyze-pip.txt
+
+fi
+
+if (( $# == 2 )); then
+    container-diff diff $1 $2 --type=history 2>&1 | tee -a diff-history.txt
+    container-diff diff $1 $2 --type=file 2>&1 | tee -a diff-file.txt
+    container-diff diff $1 $2 --type=size 2>&1 | tee -a diff-size.txt
+    container-diff diff $1 $2 --type=apt 2>&1 | tee -a diff-apt.txt
+    container-diff diff $1 $2 --type=pip 2>&1 | tee -a diff-pip.txt
+fi