Compare commits

...

17 Commits

Author SHA1 Message Date
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
9b87188b6a Merge remote-tracking branch 'origin/master' 2021-07-01 23:32:14 +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
6b19d184d5 Merge pull request #520 from bensuperpc/Improve_CI
Improve github action
2021-07-01 08:31:49 -04: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
67aab8d4af Merge branch 'master' into Improve_CI 2021-07-01 10:14:44 +02:00
56e20c597a Merge pull request #518 from bensuperpc/clean_repos 2021-06-30 21:20:35 -04:00
f859d18cd6 Add workflow_dispatch
Allow to manually trigger workflow or trigger by scripts

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-01 00:15:25 +02:00
d39e7764fa Merge with master and remove FUNDING
Merge with master and remove FUNDING

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-07-01 00:13:05 +02:00
f5daf00817 Merge branch 'master' into Improve_CI 2021-07-01 00:10:08 +02:00
979896aa30 Increase time to 120 days and 60 days for stale
Increase time to 120 days and 60 days for stale

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-06-30 16:45:24 +02:00
0762d24a6e Fix merge with master
Fix merge with master

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-06-30 16:41:11 +02:00
27fe4eaee6 Improve github action
Trigger workflow on every branch (It will be easier to test with different branches before making a pull request)
Add dependabot, check if github action have update and make PR, if there is one
Add FUNDING
Add Close Stale Issues, closes issues and PR after 75 days if doesn't have activity

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2021-06-29 23:04:25 +02:00
6 changed files with 67 additions and 4 deletions

9
.github/dependabot.yml vendored Normal file
View File

@ -0,0 +1,9 @@
# Set update schedule for GitHub Actions
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every weekday
interval: "daily"

22
.github/workflows/expired.yml vendored Normal file
View File

@ -0,0 +1,22 @@
name: 'Close stale issues and PRs'
on:
schedule:
- cron: '0 */8 * * *'
jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
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 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
days-before-pr-close: 30

View File

@ -3,7 +3,7 @@ name: Dockcross CI
on:
push:
branches:
- 'master'
- '*'
paths-ignore:
- '**/README.md'
pull_request:
@ -11,11 +11,12 @@ on:
- '*'
paths-ignore:
- '**/README.md'
workflow_dispatch:
jobs:
base:
name: base
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: build
@ -25,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:
@ -53,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