nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actions: script improvements

Browse Source 
- Rely on shebang instead of setting shell in workflow
- Run whole install-dependencies.sh in sudo
- Use /bin/sh instead of bash
- set -e
This commit is contained in:
Matthias Schiffer 2020-05-12 10:59:57 +02:00 committed by David Bauer
parent 2889904e5f
commit 55c51f2a73
4 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
.github/workflows/build-gluon.yml vendored
View File

@ -19,9 +19,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ar71xx-generic run: contrib/actions/run-build.sh ar71xx-generic
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -40,9 +40,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ar71xx-tiny run: contrib/actions/run-build.sh ar71xx-tiny
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -61,9 +61,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ar71xx-nand run: contrib/actions/run-build.sh ar71xx-nand
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -82,9 +82,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ath79-generic run: contrib/actions/run-build.sh ath79-generic
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -103,9 +103,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh brcm2708-bcm2708 run: contrib/actions/run-build.sh brcm2708-bcm2708
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -124,9 +124,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh brcm2708-bcm2709 run: contrib/actions/run-build.sh brcm2708-bcm2709
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -145,9 +145,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ipq40xx-generic run: contrib/actions/run-build.sh ipq40xx-generic
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -166,9 +166,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ipq806x-generic run: contrib/actions/run-build.sh ipq806x-generic
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -187,9 +187,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh lantiq-xrx200 run: contrib/actions/run-build.sh lantiq-xrx200
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -208,9 +208,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh lantiq-xway run: contrib/actions/run-build.sh lantiq-xway
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -229,9 +229,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh mpc85xx-generic run: contrib/actions/run-build.sh mpc85xx-generic
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -250,9 +250,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh mpc85xx-p1020 run: contrib/actions/run-build.sh mpc85xx-p1020
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -271,9 +271,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ramips-mt7620 run: contrib/actions/run-build.sh ramips-mt7620
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -292,9 +292,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ramips-mt7621 run: contrib/actions/run-build.sh ramips-mt7621
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -313,9 +313,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ramips-mt76x8 run: contrib/actions/run-build.sh ramips-mt76x8
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -334,9 +334,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ramips-rt305x run: contrib/actions/run-build.sh ramips-rt305x
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -355,9 +355,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh sunxi-cortexa7 run: contrib/actions/run-build.sh sunxi-cortexa7
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -376,9 +376,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh x86-generic run: contrib/actions/run-build.sh x86-generic
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -397,9 +397,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh x86-geode run: contrib/actions/run-build.sh x86-geode
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -418,9 +418,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh x86-64 run: contrib/actions/run-build.sh x86-64
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -439,9 +439,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh ar71xx-mikrotik run: contrib/actions/run-build.sh ar71xx-mikrotik
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -460,9 +460,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh brcm2708-bcm2710 run: contrib/actions/run-build.sh brcm2708-bcm2710
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
@ -481,9 +481,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh mvebu-cortexa9 run: contrib/actions/run-build.sh mvebu-cortexa9
- name: Archive build logs - name: Archive build logs
if: ${{ !cancelled() }} if: ${{ !cancelled() }}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1

4
contrib/actions/generate-actions.py
View File

@ -25,9 +25,9 @@ ACTIONS_TARGET="""
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Install Dependencies - name: Install Dependencies
run: bash contrib/actions/install-dependencies.sh run: sudo contrib/actions/install-dependencies.sh
- name: Build - name: Build
run: bash contrib/actions/run-build.sh {target_name} run: contrib/actions/run-build.sh {target_name}
- name: Archive build logs - name: Archive build logs
if: ${{{{ !cancelled() }}}} if: ${{{{ !cancelled() }}}}
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1

17
contrib/actions/install-dependencies.sh
View File

@ -1,7 +1,10 @@
#!/bin/bash #!/bin/sh
sudo cp contrib/actions/sources.list /etc/apt/sources.list
sudo rm -rf /etc/apt/sources.list.d set -e
sudo apt update
sudo apt install git subversion build-essential python gawk unzip libncurses5-dev zlib1g-dev libssl-dev wget time || exit 1 cp contrib/actions/sources.list /etc/apt/sources.list
sudo apt clean rm -rf /etc/apt/sources.list.d
sudo rm -rf /var/lib/apt/lists/* apt update
apt install git subversion build-essential python gawk unzip libncurses5-dev zlib1g-dev libssl-dev wget time
apt clean
rm -rf /var/lib/apt/lists/*

4
contrib/actions/run-build.sh
View File

@ -1,4 +1,6 @@
#!/bin/bash #!/bin/sh
set -e
export BROKEN=1 export BROKEN=1
export GLUON_AUTOREMOVE=1 export GLUON_AUTOREMOVE=1