diff --git a/.gitattributes b/.gitattributes index b14bc05ff..fdca880b3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ +build text eol=lf * text=auto *.* text eol=lf ./build text eol=lf diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index f01a72f4d..0f6317732 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -75,7 +75,7 @@ jobs: - name: build and test tgz package run: | make ${EMQX_NAME}-tgz - .ci/build_packages/tests.sh "$EMQX_PKG_NAME" tgz amd64 + ./scripts/pkg-tests.sh "$EMQX_PKG_NAME" tgz amd64 - name: run static checks if: contains(matrix.os, 'ubuntu') run: | @@ -83,15 +83,15 @@ jobs: - name: build and test deb/rpm packages run: | make ${EMQX_NAME}-pkg - .ci/build_packages/tests.sh "$EMQX_PKG_NAME" pkg amd64 + ./scripts/pkg-tests.sh "$EMQX_PKG_NAME" pkg amd64 - name: build and test tgz package (Elixir) run: | make ${EMQX_NAME}-elixir-tgz - .ci/build_packages/tests.sh "$EMQX_ELIXIRPKG_NAME" tgz amd64 + ./scripts/pkg-tests.sh "$EMQX_ELIXIRPKG_NAME" tgz amd64 - name: build and test deb/rpm packages (Elixir) run: | make ${EMQX_NAME}-elixirpkg - .ci/build_packages/tests.sh "$EMQX_ELIXIRPKG_NAME" pkg amd64 + ./scripts/pkg-tests.sh "$EMQX_ELIXIRPKG_NAME" pkg amd64 - uses: actions/upload-artifact@v2 with: name: ${{ matrix.profile}}-${{ matrix.otp }}-${{ matrix.os }} diff --git a/scripts/buildx.sh b/scripts/buildx.sh index 6ce40b207..afbd2ca63 100755 --- a/scripts/buildx.sh +++ b/scripts/buildx.sh @@ -120,7 +120,7 @@ else MAKE_TARGET="${PROFILE}-${PKGTYPE}" fi -CMD_RUN="export EMQX_NAME=\"$PROFILE\"; make ${MAKE_TARGET} && .ci/build_packages/tests.sh $PKG_NAME $PKGTYPE $ARCH" +CMD_RUN="export EMQX_NAME=\"$PROFILE\"; make ${MAKE_TARGET} && ./scripts/pkg-tests.sh $PKG_NAME $PKGTYPE $ARCH" if docker info; then docker run --rm --privileged tonistiigi/binfmt:latest --install "${ARCH}" diff --git a/.ci/build_packages/tests.sh b/scripts/pkg-tests.sh similarity index 100% rename from .ci/build_packages/tests.sh rename to scripts/pkg-tests.sh