Skip to content
Snippets Groups Projects
Commit 55c51f2a authored by Matthias Schiffer's avatar Matthias Schiffer Committed by David Bauer
Browse files

actions: script improvements 

- Rely on shebang instead of setting shell in workflow
- Run whole install-dependencies.sh in sudo
- Use /bin/sh instead of bash
- set -e
parent 2889904e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.github/workflows/build-gluon.yml
+ 46
− 46
View file @ 55c51f2a
...@@ -19,9 +19,9 @@ jobs: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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: ...@@ -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
......
contrib/actions/generate-actions.py
+ 2
− 2
View file @ 55c51f2a
...@@ -25,9 +25,9 @@ ACTIONS_TARGET=""" ...@@ -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
......
contrib/actions/install-dependencies.sh
+ 10
− 7
View file @ 55c51f2a
#!/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/*
contrib/actions/run-build.sh
+ 3
− 1
View file @ 55c51f2a
#!/bin/bash #!/bin/sh
set -e
export BROKEN=1 export BROKEN=1
export GLUON_AUTOREMOVE=1 export GLUON_AUTOREMOVE=1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz