Skip to content

Commit 09045a9

Browse files
committed
chore: sync with microG unofficial installer
Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>
1 parent 2754252 commit 09045a9

File tree

11 files changed

+47
-28
lines changed

11 files changed

+47
-28
lines changed

.editorconfig

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33

44
root = true
55

6-
[{cache,output,gradlew,gradlew.bat,.git,.gradle,.ash_history}]
6+
[{cache,output,gradlew,gradlew.bat}]
7+
ignore = true
8+
9+
[{.git,.gradle,.local,.ash_history,.bash_history}]
10+
ignore = true
11+
12+
[{.git-hooks/post-checkout,.git-hooks/post-commit,.git-hooks/post-merge,.git-hooks/pre-push}]
713
ignore = true
814

915
[*.{jar,apk,bin,exe}]

.github/workflows/auto-nightly.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
BUILD_TYPE='oss' '${{ github.workspace }}/build.sh'
6464
- name: "Attest build provenance"
6565
id: "attest"
66-
uses: actions/attest-build-provenance@v3
66+
uses: actions/attest-build-provenance@v4
6767
timeout-minutes: 10
6868
if: "${{ vars.NIGHTLY_ATTESTATION == 'true' && github.run_attempt == '1' && steps.build.outputs.ZIP_IS_ALPHA == 'true' && steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' }}"
6969
with:
@@ -231,13 +231,14 @@ jobs:
231231
${{ steps.info.outputs.ZIP_ATTESTATION_FILE }}
232232
fail_on_unmatched_files: true
233233
- name: "Upload artifacts"
234-
uses: actions/upload-artifact@v6
234+
uses: actions/upload-artifact@v7
235235
if: "${{ steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' }}"
236236
with:
237-
name: "${{ github.event.repository.name }} ${{ steps.build.outputs.ZIP_BRANCH_NAME || github.ref_name }} g${{ steps.build.outputs.ZIP_SHORT_COMMIT_ID }} ${{ steps.build.outputs.ZIP_BUILD_TYPE }} (extract it)"
238-
path: "${{ steps.build.outputs.ZIP_FOLDER }}/*.zip*"
239-
overwrite: false
237+
name: "${{ github.event.repository.name }} ${{ steps.build.outputs.ZIP_BRANCH_NAME || github.ref_name }} g${{ steps.build.outputs.ZIP_SHORT_COMMIT_ID }} ${{ steps.build.outputs.ZIP_BUILD_TYPE }}"
238+
path: "${{ steps.build.outputs.ZIP_FOLDER }}/*.zip"
240239
retention-days: "${{ steps.info.outputs.ZIP_RETENTION_DAYS }}"
240+
overwrite: false
241+
archive: false
241242
compression-level: 0
242243
if-no-files-found: "error"
243244

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
make clean buildotaoss
4646
- name: "Attest build provenance"
4747
id: "attest"
48-
uses: actions/attest-build-provenance@v3
48+
uses: actions/attest-build-provenance@v4
4949
timeout-minutes: 10
5050
if: "${{ vars.ATTESTATION == 'true' && github.run_attempt == '1' && steps.build.outputs.ZIP_IS_ALPHA == 'false' && steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' }}"
5151
with:

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
timeout-minutes: 10
4545
run: |
4646
# Installing Bashcov and simplecov-lcov...
47-
gem install bashcov:3.2.0 simplecov-lcov
47+
gem install bashcov:3.3.0 simplecov-lcov
4848
- name: "Build (with coverage)"
4949
id: "build"
5050
shell: bash

.github/workflows/generate-perm-xml.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
fi
4141
find './zip-content' -name '*.apk' | './tools/generate-perm-xml.sh' --use-placeholders - || exit "${?}"
4242
- name: "Upload artifacts"
43-
uses: actions/upload-artifact@v6
43+
uses: actions/upload-artifact@v7
4444
with:
4545
name: "XML permissions"
4646
path: "output/*.xml"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ source 'https://rubygems.org'
66

77
ruby ">=3.0"
88

9-
gem 'bashcov', '>=3.2'
9+
gem 'bashcov', '>=3.3'
1010
gem 'simplecov-lcov'

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
bashcov (3.2.0)
4+
bashcov (3.3.0)
55
simplecov (~> 0.21)
66
docile (1.4.1)
77
simplecov (0.22.0)
@@ -20,7 +20,7 @@ PLATFORMS
2020
x86_64-linux
2121

2222
DEPENDENCIES
23-
bashcov (>= 3.2)
23+
bashcov (>= 3.3)
2424
simplecov-lcov
2525

2626
RUBY VERSION

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
all: buildota buildotaoss ;
99

10-
.PHONY: all clean test check distcheck build cmdline
10+
.PHONY: all clean test check distcheck build
1111

1212
buildota:
1313
BUILD_TYPE=full "$(CURDIR)/build.sh" --no-default-build-type --no-pause $(ARGS)
@@ -26,4 +26,6 @@ clean:
2626
rm -f "$(CURDIR)"/output/*.zip.md5
2727
rm -f "$(CURDIR)"/output/*.zip.sha256
2828

29-
cmdline: ;
29+
# Disable the default inference rule for .sh files
30+
.sh:
31+
@:

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,12 @@ fi
350350
echo ''
351351

352352
# Generate info
353-
sha256sum "${FILENAME:?}${FILENAME_EXT:?}" > "${OUT_DIR:?}/${FILENAME:?}${FILENAME_EXT:?}.sha256" || ui_error 'Failed to compute the SHA-256 hash'
353+
sha256sum -b -- "${FILENAME:?}${FILENAME_EXT:?}" > "${OUT_DIR:?}/${FILENAME:?}${FILENAME_EXT:?}.sha256" || ui_error 'Failed to compute the SHA-256 hash'
354354
ZIP_SHA256="$(cut -d ' ' -f '1' -s 0< "${OUT_DIR:?}/${FILENAME:?}${FILENAME_EXT:?}.sha256")" || ui_error 'Failed to read the SHA-256 hash'
355355

356356
ZIP_MD5=''
357357
if test "${FAST_BUILD:-false}" = 'false'; then
358-
md5sum "${FILENAME:?}${FILENAME_EXT:?}" > "${OUT_DIR:?}/${FILENAME:?}${FILENAME_EXT:?}.md5" || ui_error 'Failed to compute the MD5 hash'
358+
md5sum -b -- "${FILENAME:?}${FILENAME_EXT:?}" > "${OUT_DIR:?}/${FILENAME:?}${FILENAME_EXT:?}.md5" || ui_error 'Failed to compute the MD5 hash'
359359
ZIP_MD5="$(cut -d ' ' -f '1' -s 0< "${OUT_DIR:?}/${FILENAME:?}${FILENAME_EXT:?}.md5")" || ui_error 'Failed to read the MD5 hash'
360360
fi
361361

recovery-simulator/recovery.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,12 @@ _backup_tmpdir="${TMPDIR:?}"
316316
readonly _backup_path _backup_tmpdir
317317

318318
# Check dependencies
319-
_our_busybox="$(env -- which -- busybox)" || fail_with_msg 'BusyBox is missing'
320319
_tee_cmd="$(command -v tee)" || fail_with_msg 'tee is missing'
320+
_our_busybox="$(command -v busybox)" || _our_busybox=''
321+
if test -z "${_our_busybox?}" || test "${_our_busybox:?}" = 'busybox'; then
322+
_our_busybox="$(env -- which -- busybox)" || _our_busybox=''
323+
if test -z "${_our_busybox?}" || test "${_our_busybox:?}" = 'busybox'; then fail_with_msg 'BusyBox is missing'; fi
324+
fi
321325
if test -n "${CYGPATH?}"; then
322326
# Only on Bash under Windows
323327
_our_busybox="$("${CYGPATH:?}" -m -a -l -- "${_our_busybox:?}")" || fail_with_msg 'Unable to convert our busybox path'

0 commit comments

Comments
 (0)