Skip to content

Beautify CI output & sh_mb2 script #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Olf0 merged 8 commits into from
Jan 27, 2023
Merged

Beautify CI output & sh_mb2 script #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca55b6e
Beatuify
Olf0 Jan 25, 2023
1730e97
Beautify
Olf0 Jan 25, 2023
d7fdfa0
Use `sh` instead of `bash`
Olf0 Jan 26, 2023
f61924d
Use `sh` instead of `bash`
Olf0 Jan 26, 2023
8a6dceb
Run Docker not privileged
Olf0 Jan 26, 2023
734957b
Run Docker not privileged
Olf0 Jan 26, 2023
a77a1df
Upload all artefacts
Olf0 Jan 27, 2023
ecc96d8
Upload all artefacts
Olf0 Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci-on-pull_req.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ jobs:
env:
ARCH: armv7hl
RELEASE: 3.4.0.24
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: |
set -x
mkdir -p output/$RELEASE/$ARCH
docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
mkdir -p build ;
cd build ;
cp -r /share/* ./ ;
mb2 -t SailfishOS-$RELEASE-$ARCH build --enable-debug ;
sudo cp -r RPMS/*.rpm /share/output/$RELEASE/$ARCH/"
docker run --rm -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/sh -xc '
mkdir -p build
cd build
cp -r /share/. .
mb2 -t SailfishOS-$1-$2 build -d
sudo cp -r RPMS/. /share/output/$1/$2/' sh_mb2 $RELEASE $ARCH

- name: Upload build results
uses: actions/upload-artifact@v3
Expand Down
84 changes: 42 additions & 42 deletions .github/workflows/ci-on-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,85 +33,85 @@ jobs:
env:
ARCH: aarch64
RELEASE: ${{ env.LATEST }}
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: |
set -x
mkdir -p output/$RELEASE/$ARCH
docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
mkdir -p build ;
cd build ;
cp -r /share/* ./ ;
mb2 -t SailfishOS-$RELEASE-$ARCH build --enable-debug ;
sudo cp -r RPMS/*.rpm /share/output/$RELEASE/$ARCH/"
docker run --rm -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/sh -xc '
mkdir -p build
cd build
cp -r /share/. .
mb2 -t SailfishOS-$1-$2 build -d
sudo cp -r RPMS/. /share/output/$1/$2/' sh_mb2 $RELEASE $ARCH

- name: Build ${{ env.ARCH }} on ${{ env.RELEASE }}
env:
ARCH: armv7hl
RELEASE: ${{ env.LATEST }}
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: |
set -x
mkdir -p output/$RELEASE/$ARCH
docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
mkdir -p build ;
cd build ;
cp -r /share/* ./ ;
mb2 -t SailfishOS-$RELEASE-$ARCH build --enable-debug ;
sudo cp -r RPMS/*.rpm /share/output/$RELEASE/$ARCH/"
docker run --rm -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/sh -xc '
mkdir -p build
cd build
cp -r /share/. .
mb2 -t SailfishOS-$1-$2 build -d
sudo cp -r RPMS/. /share/output/$1/$2/' sh_mb2 $RELEASE $ARCH

- name: Build ${{ env.ARCH }} on ${{ env.RELEASE }}
env:
ARCH: i486
RELEASE: ${{ env.LATEST }}
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: |
set -x
mkdir -p output/$RELEASE/$ARCH
docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
mkdir -p build ;
cd build ;
cp -r /share/* ./ ;
mb2 -t SailfishOS-$RELEASE-$ARCH build --enable-debug ;
sudo cp -r RPMS/*.rpm /share/output/$RELEASE/$ARCH/"
docker run --rm -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/sh -xc '
mkdir -p build
cd build
cp -r /share/. .
mb2 -t SailfishOS-$1-$2 build -d
sudo cp -r RPMS/. /share/output/$1/$2/' sh_mb2 $RELEASE $ARCH

- name: Build ${{ env.ARCH }} on ${{ env.RELEASE }}
env:
ARCH: aarch64
RELEASE: 4.0.1.45
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: |
set -x
mkdir -p output/$RELEASE/$ARCH
docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
mkdir -p build ;
cd build ;
cp -r /share/* ./ ;
mb2 -t SailfishOS-$RELEASE-$ARCH build --enable-debug ;
sudo cp -r RPMS/*.rpm /share/output/$RELEASE/$ARCH/"
docker run --rm -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/sh -xc '
mkdir -p build
cd build
cp -r /share/. .
mb2 -t SailfishOS-$1-$2 build -d
sudo cp -r RPMS/. /share/output/$1/$2/' sh_mb2 $RELEASE $ARCH

- name: Build ${{ env.ARCH }} on ${{ env.RELEASE }}
env:
ARCH: armv7hl
RELEASE: 3.4.0.24
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: |
set -x
mkdir -p output/$RELEASE/$ARCH
docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
mkdir -p build ;
cd build ;
cp -r /share/* ./ ;
mb2 -t SailfishOS-$RELEASE-$ARCH build --enable-debug ;
sudo cp -r RPMS/*.rpm /share/output/$RELEASE/$ARCH/"
docker run --rm -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/sh -xc '
mkdir -p build
cd build
cp -r /share/. .
mb2 -t SailfishOS-$1-$2 build -d
sudo cp -r RPMS/. /share/output/$1/$2/' sh_mb2 $RELEASE $ARCH

- name: Build ${{ env.ARCH }} on ${{ env.RELEASE }}
env:
ARCH: i486
RELEASE: 3.4.0.24
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: |
set -x
mkdir -p output/$RELEASE/$ARCH
docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
mkdir -p build ;
cd build ;
cp -r /share/* ./ ;
mb2 -t SailfishOS-$RELEASE-$ARCH build --enable-debug ;
sudo cp -r RPMS/*.rpm /share/output/$RELEASE/$ARCH/"
docker run --rm -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/sh -xc '
mkdir -p build
cd build
cp -r /share/. .
mb2 -t SailfishOS-$1-$2 build -d
sudo cp -r RPMS/. /share/output/$1/$2/' sh_mb2 $RELEASE $ARCH

- name: Upload build results
uses: actions/upload-artifact@v3
Expand Down