taixingyiji/subconverter
1
0
Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2025-10-26 10:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build error

Browse Source 
Use self-hosted machine for ARM docker build.
This commit is contained in:
Tindy X
2022-08-24 04:21:58 +08:00
parent 6c745370f8
commit 47f8e35565
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/docker.yml vendored
View File

@@ -142,7 +142,7 @@ jobs:
armv7_build:
name: Build ARMv7 Image
runs-on: ubuntu-latest
runs-on: [self-hosted, linux, ARM64]
steps:
- name: Checkout base
uses: actions/checkout@v2
@@ -215,7 +215,7 @@ jobs:
arm64_build:
name: Build ARM64 Image
runs-on: ubuntu-latest
runs-on: [self-hosted, linux, ARM64]
steps:
- name: Checkout base
uses: actions/checkout@v2

2
scripts/merge_manifest.py
View File

@@ -7,7 +7,7 @@ TARGET_TAG="latest" if len(sys.argv) < 2 else sys.argv[1]
args=["docker manifest create {}:{}".format(MAIN_IMAGE_NAME, TARGET_TAG)]
for i in glob.glob("/tmp/images/*/*.txt"):
with open(i, "r") as file:
args += " --amend {}@{}".format(MAIN_IMAGE_NAME, file.readline())
args += " --amend {}@{}".format(MAIN_IMAGE_NAME, file.readline().strip())
cmd_create="".join(args)
cmd_push="docker manifest push {}:{}".format(MAIN_IMAGE_NAME, TARGET_TAG)
os.system(cmd_create)