Skip to content

Commit cf686c4

Browse files
committed
Sync with microG unofficial installer
1 parent 2a50ee9 commit cf686c4

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/auto-nightly.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,20 +97,20 @@ jobs:
9797
run: |
9898
# Nightly logic...
9999
UPDATE_TAG='false'
100-
CREATE_RELEASE='false'
100+
UPDATE_RELEASE='false'
101101
if '${{ github.ref_name == github.event.repository.default_branch && github.run_attempt == '1' && steps.build.outputs.ZIP_IS_ALPHA == 'true' }}'; then
102102
UPDATE_TAG='true'
103103
fi
104-
if '${{ github.ref_name == github.event.repository.default_branch && github.run_attempt == '1' && steps.build.outputs.ZIP_IS_ALPHA == 'true' && steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' }}'; then
105-
CREATE_RELEASE='true'
104+
if test "${UPDATE_TAG:?}" = 'true' && '${{ steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' }}'; then
105+
UPDATE_RELEASE='true'
106106
fi
107107
printf 'UPDATE_TAG=%s\n' "${UPDATE_TAG:?}" 1>> "${GITHUB_OUTPUT?}"
108-
printf 'CREATE_RELEASE=%s\n' "${CREATE_RELEASE:?}" 1>> "${GITHUB_OUTPUT?}"
108+
printf 'UPDATE_RELEASE=%s\n' "${UPDATE_RELEASE:?}" 1>> "${GITHUB_OUTPUT?}"
109109
printf 'Update tag? %s\n' "${UPDATE_TAG:?}"
110-
printf 'Create release? %s\n' "${CREATE_RELEASE:?}"
110+
printf 'Update release? %s\n' "${UPDATE_RELEASE:?}"
111111
- name: "Delete previous nightly release"
112112
uses: actions/github-script@v7
113-
if: "${{ steps.nightly-logic.outputs.CREATE_RELEASE == 'true' }}"
113+
if: "${{ steps.nightly-logic.outputs.UPDATE_RELEASE == 'true' }}"
114114
with:
115115
retries: 3
116116
script: |
@@ -170,7 +170,7 @@ jobs:
170170
}
171171
- name: "Create nightly release"
172172
uses: softprops/action-gh-release@v2
173-
if: "${{ steps.nightly-logic.outputs.CREATE_RELEASE == 'true' }}"
173+
if: "${{ steps.nightly-logic.outputs.UPDATE_RELEASE == 'true' }}"
174174
with:
175175
name: "${{ steps.build.outputs.ZIP_VERSION }} nightly"
176176
tag_name: "nightly"

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ if test "${CI:-false}" != 'false'; then
194194
fi
195195
else
196196
branch_name="$(git 2> /dev/null branch --show-current)" || branch_name="$(git 2> /dev/null rev-parse --abbrev-ref HEAD)" || branch_name=''
197-
if test -n "${branch_name?}" && test "${branch_name:?}" != 'main'; then
197+
if test -n "${branch_name?}" && test "${branch_name:?}" != 'main' && test "${branch_name:?}" != 'master' && test "${branch_name:?}" != 'HEAD'; then
198198
FILENAME_MIDDLE="${branch_name:?}-${FILENAME_MIDDLE:?}"
199199
fi
200200
fi

tools/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TOOLS
99

1010
- zipsigner_ **3.0** => zipsigner.jar
1111
- zipsigner_ **3.0** (Dalvik) => zipsigner-dvk.jar
12-
- `BusyBox for Windows`_ **1.38.0-PRE-5615-g58ce42e2c (2025-07-11)** => win/busybox.exe
12+
- `BusyBox for Windows`_ **1.38.0-PRE-5618-g3ddcebe75 (2025-07-30)** => win/busybox.exe
1313
- `BusyBox legacy for Windows`_ **1.21.0-TIG-931-g7e6a84d (2012-11-29)** => win/busybox-legacy.bin
1414
- Zip_ **3.0** => win/zip.exe
1515
- UnZip_ **6.0** => win/unzip.exe

tools/win/busybox.exe

2.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)