Skip to content

[CI workflows] Omit "Prepare" step #394

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 2 commits into from
Jan 24, 2023
Merged

[CI workflows] Omit "Prepare" step #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f03fb0e
Omit "Prepare" step
Olf0 Jan 23, 2023
21c90c8
Omit "Prepare" step
Olf0 Jan 23, 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
8 changes: 5 additions & 3 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 @@ -15,8 +15,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Prepare
run: mkdir -p output/3.4.0.24/armv7hl
#- name: Prepare
# run:

# Caching Docker images is not ready yet, see
# https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
Expand All @@ -32,7 +32,9 @@ jobs:
ARCH: armv7hl
RELEASE: 3.4.0.24
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
run: |
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/* ./ ;
Expand Down
30 changes: 20 additions & 10 deletions .github/workflows/ci-on-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Prepare
run: |
mkdir -p output/{4.0.1.45,$LATEST}/aarch64
mkdir -p output/{3.4.0.24,$LATEST}/{armv7hl,i486}
#- name: Prepare
# run:

# Caching Docker images is not ready yet, see
# https://github.com/storeman-developers/harbour-storeman-installer/blob/devel/cache-docker-images_github-ci.md
Expand All @@ -36,7 +34,9 @@ jobs:
ARCH: aarch64
RELEASE: ${{ env.LATEST }}
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
run: |
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/* ./ ;
Expand All @@ -48,7 +48,9 @@ jobs:
ARCH: armv7hl
RELEASE: ${{ env.LATEST }}
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
run: |
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/* ./ ;
Expand All @@ -60,7 +62,9 @@ jobs:
ARCH: i486
RELEASE: ${{ env.LATEST }}
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
run: |
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/* ./ ;
Expand All @@ -72,7 +76,9 @@ jobs:
ARCH: aarch64
RELEASE: 4.0.1.45
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
run: |
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/* ./ ;
Expand All @@ -84,7 +90,9 @@ jobs:
ARCH: armv7hl
RELEASE: 3.4.0.24
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
run: |
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/* ./ ;
Expand All @@ -96,7 +104,9 @@ jobs:
ARCH: i486
RELEASE: 3.4.0.24
# mb2 wants bash: https://github.com/sailfishos/sdk-setup/blob/master/sdk-setup/src/mb2#L1
run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
run: |
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/* ./ ;
Expand Down