fix(tgz): replace zip with tgz after rebase

.ci/build_packages/tests.sh

@@ -13,7 +13,7 @@ case "${2:-}" in
     true
     ;;
   *)
-    echo "Usage $0 <PACKAGE_NAME> zip|pkg"
+    echo "Usage $0 <PACKAGE_NAME> tgz|pkg"
     exit 1
     ;;
 esac

.github/workflows/build_packages.yaml

@@ -397,10 +397,10 @@ jobs:
       working-directory: source
       if: ${{ matrix.build_elixir == 'with_elixir' }}
       run: |
-        ## we currently only build zips for elixir
+        ## we currently only build tgzs for elixir
         ./scripts/buildx.sh \
           --profile "${PROFILE}" \
-          --pkgtype "zip" \
+          --pkgtype "tgz" \
           --arch "${ARCH}" \
           --otp "${OTP}" \
           --elixir "${ELIXIR}" \

.github/workflows/build_slim_packages.yaml

@@ -84,8 +84,8 @@ jobs:
         .ci/build_packages/tests.sh "$EMQX_PKG_NAME" pkg amd64
     - name: build and test zip package (Elixir)
       run: |
-        make ${EMQX_NAME}-elixir-zip
+        make ${EMQX_NAME}-elixir-tgz
-        .ci/build_packages/tests.sh "$EMQX_PKG_NAME" zip amd64
+        .ci/build_packages/tests.sh "$EMQX_PKG_NAME" tgz amd64
     - name: build and test deb/rpm packages (Elixir)
       run: |
         make ${EMQX_NAME}-elixirpkg

Makefile

@@ -235,10 +235,10 @@ $1-elixirpkg: $1-pkg-elixir
 endef
 $(foreach pt,$(REL_PROFILES),$(eval $(call gen-elixirpkg-target,$(pt))))
 
-.PHONY: $(REL_PROFILES:%=%-elixir-zip)
+.PHONY: $(REL_PROFILES:%=%-elixir-tgz)
-define gen-elixir-zip-target
+define gen-elixir-tgz-target
-$1-elixir-zip: $(ELIXIR_COMMON_DEPS) mix-deps-get
+$1-elixir-tgz: $(COMMON_DEPS) $(ELIXIR_COMMON_DEPS) mix-deps-get
-	@env IS_ELIXIR=yes $(BUILD) $1 zip
+	@env IS_ELIXIR=yes $(BUILD) $1 tgz
 endef
-ALL_ELIXIR_ZIPS = $(REL_PROFILES)
+ALL_ELIXIR_TGZS = $(REL_PROFILES)
-$(foreach zt,$(ALL_ELIXIR_ZIPS),$(eval $(call gen-elixir-zip-target,$(zt))))
+$(foreach tt,$(ALL_ELIXIR_TGZS),$(eval $(call gen-elixir-tgz-target,$(tt))))

build

@@ -139,7 +139,6 @@ make_tgz() {
       ELIXIR_MAKE_TAR=yes make_elixir_rel
 
       local relpath="_build/prod"
-      tarball="${relpath}/${PROFILE}-${PKG_VSN}-elixir${ELIXIR_VSN}-otp${OTP_VSN}-${SYSTEM}-${ARCH}.tar.gz"
       target="${pkgpath}/${PROFILE}-${PKG_VSN}-elixir${ELIXIR_VSN}-otp${OTP_VSN}-${SYSTEM}-${ARCH}.tar.gz"
     else
       # build the tarball again to ensure relup is included
@@ -147,10 +146,10 @@ make_tgz() {
       make_rel
 
       local relpath="_build/${PROFILE}/rel/emqx"
-      tarball="${relpath}/${PROFILE}-${PKG_VSN}-otp${OTP_VSN}-${SYSTEM}-${ARCH}.tar.gz"
       target="${pkgpath}/${PROFILE}-${PKG_VSN}-otp${OTP_VSN}-${SYSTEM}-${ARCH}.tar.gz"
     fi
 
+    tarball="${relpath}/emqx-${PKG_VSN}.tar.gz"
     tard="/tmp/emqx_untar_${PKG_VSN}"
     rm -rf "${tard}"
     mkdir -p "${tard}/emqx"

scripts/buildx.sh

@@ -100,7 +100,7 @@ case "$PKGTYPE" in
     true
     ;;
   *)
-    echo "Bad --pkgtype option, should be zip or pkg"
+    echo "Bad --pkgtype option, should be tgz or pkg"
     exit 1
     ;;
 esac
@@ -112,9 +112,10 @@ PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh "$PROFILE")}"
 if [ "$WITH_ELIXIR" = "yes" ]
 then
   PKG_NAME="${PROFILE}-${PKG_VSN}-elixir${ELIXIR_VSN}-otp${OTP_VSN}-${SYSTEM}-${ARCH}"
-  PROFILE="${PROFILE}-elixir"
+  MAKE_TARGET="${PROFILE}-elixir-${PKGTYPE}"
 else
   PKG_NAME="${PROFILE}-${PKG_VSN}-otp${OTP_VSN}-${SYSTEM}-${ARCH}"
+  MAKE_TARGET="${PROFILE}-${PKGTYPE}"
 fi
 
 docker info
@@ -125,4 +126,4 @@ docker run -i --rm \
     --platform="linux/$ARCH" \
     -e EMQX_NAME="$PROFILE" \
     "$BUILDER" \
-    bash -euc "make ${PROFILE}-${PKGTYPE} && .ci/build_packages/tests.sh $PKG_NAME $PKGTYPE $ARCH"
+    bash -euc "make ${MAKE_TARGET} && .ci/build_packages/tests.sh $PKG_NAME $PKGTYPE $ARCH"