Merge pull request #229 from id/0807-ci-minor-update

emqx · Aug 14, 2023 · faf8f59 · faf8f59
2 parents 4031ed5 + 563c1eb
commit faf8f59
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,9 +23,7 @@ jobs:
         with:
           images: ${{ github.repository }}
           tags: |
-            type=ref,event=branch
             type=ref,event=pr
-            type=ref,event=tag
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
       - uses: docker/login-action@v2
@@ -36,7 +34,7 @@ jobs:
       - uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -119,10 +117,11 @@ jobs:
           KERL_CONFIGURE_OPTIONS: '--disable-hipe --disable-jit'
         run: |
           set -eux
-          if [ ! -d $HOME/.kerl/$OTP ]; then
-            kerl build git https://github.com/emqx/otp.git OTP-$OTP $OTP
-            kerl install $OTP $HOME/.kerl/$OTP
-          fi
+          kerl delete build $OTP || true
+          kerl delete installation $OTP || true
+          rm -rf $HOME/.kerl/$OTP
+          kerl build git https://github.com/emqx/otp.git OTP-$OTP $OTP
+          kerl install $OTP $HOME/.kerl/$OTP
       - name: build
         env:
           OTP: ${{ matrix.otp }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,4 +1,4 @@
-name: build
+name: release
 on:
   push:
     tags:
@@ -36,7 +36,6 @@ jobs:
           images: ${{ github.repository }}
           tags: |
             type=ref,event=branch
-            type=ref,event=pr
             type=ref,event=tag
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -144,10 +143,11 @@ jobs:
           KERL_CONFIGURE_OPTIONS: '--disable-hipe --disable-jit'
         run: |
           set -eux
-          if [ ! -d $HOME/.kerl/$OTP ]; then
-            kerl build git https://github.com/emqx/otp.git OTP-$OTP $OTP
-            kerl install $OTP $HOME/.kerl/$OTP
-          fi
+          kerl delete build $OTP || true
+          kerl delete installation $OTP || true
+          rm -rf $HOME/.kerl/$OTP
+          kerl build git https://github.com/emqx/otp.git OTP-$OTP $OTP
+          kerl install $OTP $HOME/.kerl/$OTP
       - name: build
         env:
           OTP: ${{ matrix.otp }}