Skip to content

Commit 11a7c6a

Browse files
committed
Sync with microG unofficial installer
1 parent 8e3395d commit 11a7c6a

File tree

7 files changed

+237
-159
lines changed

7 files changed

+237
-159
lines changed

.github/workflows/auto-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
uses: softprops/action-gh-release@v2
111111
if: "${{ steps.release-decision.outputs.CREATE_RELEASE == 'true' }}"
112112
with:
113-
name: "Nightly build"
113+
name: "${{ steps.build.outputs.ZIP_VERSION }} nightly"
114114
tag_name: "nightly"
115115
target_commitish: "${{ github.sha }}"
116116
body: "Latest automatically built ZIP (unstable development snapshot)\n\nSHA-256: ${{ steps.build.outputs.ZIP_SHA256 }}"

.github/workflows/auto-release-from-tag.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ concurrency:
1313
group: "${{ github.repository_id }}-${{ github.workflow }}"
1414
cancel-in-progress: false
1515
jobs:
16-
base-job:
16+
release:
1717
name: "Release"
1818
runs-on: ubuntu-latest
19-
if: "startsWith(github.ref, 'refs/tags/v')"
19+
if: "${{ startsWith(github.ref, 'refs/tags/v') && github.event_name != 'pull_request' }}"
2020
permissions:
2121
contents: write
2222

@@ -59,9 +59,9 @@ jobs:
5959
: "${ZIP_FOLDER:?}" || exit "${?}"
6060
- name: "Create release"
6161
uses: softprops/action-gh-release@v2
62-
if: "${{ steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' && steps.build.outputs.ZIP_IS_ALPHA == 'false' && github.event_name != 'pull_request' }}"
62+
if: "${{ steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' && steps.build.outputs.ZIP_IS_ALPHA == 'false' }}"
6363
with:
64-
body: "See the complete [**changelog**](./CHANGELOG.rst)."
64+
body: "SHA-256: ${{ steps.build.outputs.ZIP_SHA256 }}\n\nSee the complete [**changelog**](./CHANGELOG.rst)."
6565
append_body: true
6666
generate_release_notes: true
6767
draft: false

.github/workflows/base.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,50 @@ jobs:
2424
- name: "Setup Ruby"
2525
uses: ruby/setup-ruby@v1
2626
with:
27-
ruby-version: "3.3"
27+
ruby-version: "3.4"
2828
- name: "Install Bashcov and simplecov-lcov"
2929
run: |
3030
# Installing Bashcov and simplecov-lcov...
3131
gem install bashcov:3.1.3 simplecov-lcov
32-
- name: "Coverage and testing"
32+
- name: "Build (with coverage)"
33+
id: "build"
34+
shell: bash
3335
run: |
34-
### Executing code coverage...
35-
workspace_path='${{ github.workspace }}'; readonly workspace_path
36+
# Executing code coverage...
3637
export BUILD_TYPE=oss
3738
#sudo apt-get -qq -y install moreutils 1>/dev/null
38-
bashcov "${workspace_path:?}/build.sh" # To timestamp the output pipe it to: TZ=UTC ts '[%H:%M:%S]'
39-
printf '\n'
40-
### Testing of zip installation...
39+
bashcov '${{ github.workspace }}/build.sh' # To timestamp the output pipe it to: TZ=UTC ts '[%H:%M:%S]'
40+
- name: "Testing (with coverage)"
41+
if: "${{ steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' }}"
42+
shell: bash
43+
run: |
44+
# Testing of zip installation...
4145
echo '==========================='
4246
echo 'TESTING OF ZIP INSTALLATION'
4347
echo '==========================='
44-
# bashcov "${workspace_path:?}/recovery-simulator/recovery.sh" "${workspace_path:?}"/output/*.zip
48+
bashcov '${{ github.workspace }}/recovery-simulator/recovery.sh' '${{ steps.build.outputs.ZIP_FOLDER }}/${{ steps.build.outputs.ZIP_FILENAME }}'
4549
printf '\n'
4650
echo '==============='
4751
echo 'RECOVERY OUTPUT'
4852
echo '==============='
49-
if test -e "${workspace_path:?}/recovery-simulator/output/recovery-output.log"; then
50-
cat "${workspace_path:?}/recovery-simulator/output/recovery-output.log"
53+
if test -e '${{ github.workspace }}/recovery-simulator/output/recovery-output.log'; then
54+
cat '${{ github.workspace }}/recovery-simulator/output/recovery-output.log'
5155
fi
5256
printf '\n'
5357
echo '==============='
5458
echo 'INSTALLED FILES'
5559
echo '==============='
56-
if test -e "${workspace_path:?}/recovery-simulator/output/installed-files.log"; then
57-
cat "${workspace_path:?}/recovery-simulator/output/installed-files.log"
60+
if test -e '${{ github.workspace }}/recovery-simulator/output/installed-files.log'; then
61+
cat '${{ github.workspace }}/recovery-simulator/output/installed-files.log'
5862
fi
59-
- name: "Upload coverage reports to Codacy"
60-
if: "${{ github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && github.repository_owner == 'micro5k' }}"
61-
uses: codacy/codacy-coverage-reporter-action@v1
62-
with:
63-
project-token: "${{ secrets.CODACY_PROJECT_TOKEN }}"
6463
- name: "Upload coverage reports to Codecov"
6564
if: "${{ github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && github.repository_owner == 'micro5k' }}"
6665
uses: codecov/codecov-action@v5
6766
with:
6867
fail_ci_if_error: true
6968
token: "${{ secrets.CODECOV_TOKEN }}"
69+
- name: "Upload coverage reports to Codacy"
70+
if: "${{ github.ref == 'refs/heads/main' && github.event_name != 'pull_request' && github.repository_owner == 'micro5k' }}"
71+
uses: codacy/codacy-coverage-reporter-action@v1
72+
with:
73+
project-token: "${{ secrets.CODACY_PROJECT_TOKEN }}"

.github/workflows/create-tag-now.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
tag-creation:
1414
name: "Tag creation"
1515
runs-on: ubuntu-latest
16+
if: "${{ ! startsWith(github.ref, 'refs/tags/') }}"
1617
permissions:
1718
contents: write # Needed to create a tag
1819
actions: write # Needed to trigger a workflow

.github/workflows/scripts-testing.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717
- "tools/*.sh"
1818
- "includes/*.sh"
1919
- "cmdline.sh"
20+
schedule:
21+
- cron: "0 0 * * 2"
2022
workflow_dispatch:
2123

2224
jobs:

0 commit comments

Comments
 (0)