Compare commits

..

15 Commits

Author SHA1 Message Date
cbc4e215bf Merge remote-tracking branch 'origin/master' into update_web-wasm 2021-07-03 09:52:27 +02:00
ec4a94b6e4 Merge branch 'dockcross:master' into master 2021-07-02 23:22:52 +02:00
52fff63ed5 Merge pull request #523 from bensuperpc/update_tools_scripts 2021-07-02 16:19:07 -04:00
7e19ab94dc Merge branch 'dockcross:master' into master 2021-07-02 15:59:17 +02:00
5e2e17def5 switch to rv64gc and rv32gc
switch to rv64gc and rv32gc

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-02 15:16:51 +02:00
7c971f34dc Update commit
Update commit

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-02 15:16:51 +02:00
c686ea6515 Add riscv32 and riscv64
Add riscv32 and riscv64

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-02 15:16:51 +02:00
2d42afb5c1 Fix wrong days count in commentary (120 and 30), update runner to ubuntu-latest
Fix wrong days count in commentary (120 and 30), update runner to ubuntu-latest

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-02 08:45:02 +02:00
df0662e75c Merge remote-tracking branch 'origin/master' into update_tools_scripts 2021-07-02 07:43:56 +02:00
4463776a2e Fix wrong path in cache
Change base.tar.xz to ./cache/base.tar.xz

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-01 18:25:04 +02:00
fd0291d794 Reduce stale to run every 8h
Reduce stale to run every 8h

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-01 17:59:13 +02:00
c25ebfcee8 Add compression for base image
Add .tar.xz with maximum compression -e9

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-01 17:54:04 +02:00
bfd2f18e73 Merge remote-tracking branch 'origin/master' into update_tools_scripts 2021-07-01 17:41:22 +02:00
c29d002110 Add container-diff scripts and update others
Add container-diff scripts and update others

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-01 12:58:57 +02:00
12cd5f2a9f Update to emscripten 2.0.25
Update to emscripten 2.0.25

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-01 10:44:36 +02:00
6 changed files with 41 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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

26
tools/container-diff.sh Executable file
View File

@ -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

View File

@ -1,4 +1,4 @@
FROM emscripten/emsdk:2.0.24
FROM emscripten/emsdk:2.0.25
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python
#include "common.docker"
ENV EMSCRIPTEN_VERSION 2.0.22
ENV EMSCRIPTEN_VERSION 2.0.25
ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
ENV CC=/emsdk/upstream/emscripten/emcc \