diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 79b98156a..d55441459 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -35,7 +35,7 @@ jobs: - name: Build and export id: build - if: github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/heads/') uses: docker/build-push-action@v3 with: platforms: linux/amd64 @@ -65,7 +65,7 @@ jobs: outputs: type=image,push=true - name: Save digest - if: github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/heads/') run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt - name: Save release digest @@ -102,7 +102,7 @@ jobs: - name: Build and export id: build - if: github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/heads/') uses: docker/build-push-action@v3 with: platforms: linux/386 @@ -132,7 +132,7 @@ jobs: outputs: type=image,push=true - name: Save digest - if: github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/heads/') run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt - name: Save release digest @@ -169,7 +169,7 @@ jobs: - name: Build and export id: build - if: github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/heads/') uses: docker/build-push-action@v3 with: platforms: linux/arm/v7 @@ -202,7 +202,7 @@ jobs: outputs: type=image,push=true - name: Save digest - if: github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/heads/') run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt - name: Save release digest @@ -239,7 +239,7 @@ jobs: - name: Build and export id: build - if: github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/heads/') uses: docker/build-push-action@v3 with: platforms: linux/arm64 @@ -272,7 +272,7 @@ jobs: outputs: type=image,push=true - name: Save digest - if: github.ref == 'refs/heads/master' + if: startsWith(github.ref, 'refs/heads/') run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt - name: Save release digest @@ -327,8 +327,8 @@ jobs: return context.payload.ref.replace(/\/?refs\/tags\/v/, '') result-encoding: string - - name: Merge and push manifest on master branch - if: github.ref == 'refs/heads/master' + - name: Merge and push manifest on push + if: startsWith(github.ref, 'refs/heads/') run: python scripts/merge_manifest.py - name: Merge and push manifest on release diff --git a/scripts/build.alpine.release.sh b/scripts/build.alpine.release.sh index 50998fa8f..61dc66f65 100644 --- a/scripts/build.alpine.release.sh +++ b/scripts/build.alpine.release.sh @@ -48,7 +48,7 @@ set -xe #g++ -o base/subconverter $(find CMakeFiles/subconverter.dir/src/ -name "*.o") -static -lpcre2-8 -lyaml-cpp -L/usr/lib64 -lcurl -lmbedtls -lmbedcrypto -lmbedx509 -lz -l:quickjs/libquickjs.a -llibcron -O3 -s apk add git g++ build-base linux-headers cmake python3 curl unzip p7zip perl -apk add lua5.4-dev luajit-dev mbedtls-dev mbedtls-static zlib-dev +apk add lua5.4-dev luajit-dev zlib-dev curl-dev curl-static curl -fsSL https://xmake.io/shget.text | bash source "$HOME/.xmake/profile" diff --git a/xmake/quickjspp.lua b/xmake/quickjspp.lua index 292fbb3c8..bcb4f23fa 100644 --- a/xmake/quickjspp.lua +++ b/xmake/quickjspp.lua @@ -18,7 +18,7 @@ package("quickjspp") add_syslinks("pthread", "dl", "m") end - on_install("linux", "macosx", "windows", function (package) + on_install("linux", "macosx", "mingw", function (package) local configs = {"-DBUILD_TESTING=OFF"} -- TODO, disable lto, maybe we need do it better io.replace("CMakeLists.txt", "set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)", "", {plain = true})