Просмотр исходного кода

Merge pull request #4294 from Rory-Z/chore/update-pkg-vsn

chore(script): remove the prefix of pkg-vsn.sh
Zaiming Shi 5 лет назад
Родитель
Сommit
cc5baabd06

+ 3 - 2
.ci/build_packages/tests.sh

@@ -1,8 +1,9 @@
 #!/bin/sh
 set -x -e -u
+export CODE_PATH=${CODE_PATH:-"/emqx"}
 export EMQX_NAME=${EMQX_NAME:-"emqx"}
-export PACKAGE_PATH="/emqx/_packages/${EMQX_NAME}"
-export RELUP_PACKAGE_PATH="/emqx/relup_packages/${EMQX_NAME}"
+export PACKAGE_PATH="${CODE_PATH}/_packages/${EMQX_NAME}"
+export RELUP_PACKAGE_PATH="${CODE_PATH}/relup_packages/${EMQX_NAME}"
 # export EMQX_NODE_NAME="emqx-on-$(uname -m)@127.0.0.1"
 # export EMQX_NODE_COOKIE=$(date +%s%N)
 

+ 26 - 0
.github/workflows/build_slim_packages.yaml

@@ -0,0 +1,26 @@
+name: Build slim packages
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    
+    strategy:
+      matrix:
+        erl_otp:
+        - erl23.2.2
+        os:
+        - ubuntu20.04
+        - centos8
+
+    container: emqx/build-env:${{ matrix.erl_otp }}-${{ matrix.os }}
+    
+    steps:
+    - uses: actions/checkout@v1
+    - name: build packages
+      run: make emqx-pkg
+    - name: pakcages test
+      run: |
+        export CODE_PATH=$GITHUB_WORKSPACE
+        .ci/build_packages/tests.sh

+ 1 - 5
include/emqx_release.hrl

@@ -25,12 +25,8 @@
 %% plugins had a bug to fix. So for a hot beam upgrade, only the app
 %% with beam files changed needs an upgrade.
 
-%% NOTE: The version string prefix should be:
-%% 'v' for opensource edition
-%% 'e' for enterprise edition
-
 %% NOTE: This version number should be manually bumped for each release
 
--define(EMQX_RELEASE, "v4.3-beta.1").
+-define(EMQX_RELEASE, "4.3-beta.1").
 
 -endif.