yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7287 from zmstone/update-to-mria-0.2.1 

chore: pin mria 0.2.1
This commit is contained in:
Zaiming (Stone) Shi 2022-03-11 20:31:18 +01:00 committed by GitHub
parent 24251aea5d 49ad66b4bd
commit 5dcdf13574
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 2 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/build_packages.yaml vendored
View File

@ -25,7 +25,6 @@ jobs:
container: "ghcr.io/emqx/emqx-builder/5.0-8:1.13.3-24.2.1-1-ubuntu20.04"
outputs:
DEP_ROCKSDB_REF: ${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
DEP_QUICER_REF: ${{ steps.deps-refs.outputs.DEP_QUICER_REF }}
steps:
@ -144,11 +143,6 @@ jobs:
kerl build ${{ matrix.otp }}
kerl install ${{ matrix.otp }} $HOME/.kerl/${{ matrix.otp }}
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: source/_build/default/lib/rocksdb/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ needs.prepare.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:
@ -282,13 +276,6 @@ jobs:
path: .
- name: unzip source code
run: unzip -q source.zip
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: |
source/_build/default/lib/rocksdb/
source/deps/rocksdb/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ needs.prepare.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:
@ -390,13 +377,6 @@ jobs:
- uses: docker/setup-buildx-action@v1
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: |
source/_build/default/lib/rocksdb/
source/deps/rocksdb//
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ needs.prepare.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:

12
.github/workflows/build_slim_packages.yaml vendored
View File

@ -53,13 +53,6 @@ jobs:
run: |
scripts/get-dep-refs.sh
make clean-all
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: |
_build/default/lib/rocksdb/
deps/rocksdb/
key: ${{ matrix.os }}-${{ matrix.elixir }}-${{ matrix.otp }}-amd64-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:
@ -174,11 +167,6 @@ jobs:
sudo cp rebar3 /usr/local/bin/rebar3
scripts/get-dep-refs.sh
make clean-all
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: _build/default/lib/rocksdb/
key: ${{ matrix.macos }}-${{ matrix.otp }}-macos-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:

5
.github/workflows/run_emqx_app_tests.yaml vendored
View File

@ -40,11 +40,6 @@ jobs:
run: |
PATH=$PATH:./ scripts/get-dep-refs.sh
make clean-all
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: _build/default/lib/rocksdb/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:

12
.github/workflows/run_fvt_tests.yaml vendored
View File

@ -73,13 +73,6 @@ jobs:
make ensure-rebar3
sudo cp rebar3 /usr/local/bin/rebar3
scripts/get-dep-refs.sh
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: |
source/_build/default/lib/rocksdb/
source/deps/rocksdb/
key: ${{ matrix.os }}-${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:
@ -156,11 +149,6 @@ jobs:
make ensure-rebar3
sudo cp rebar3 /usr/local/bin/rebar3
scripts/get-dep-refs.sh
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: source/_build/default/lib/rocksdb/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:

5
.github/workflows/run_relup_tests.yaml vendored
View File

@ -78,11 +78,6 @@ jobs:
cd emqx
scripts/get-dep-refs.sh
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: emqx/_build/default/lib/rocksdb/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:

10
.github/workflows/run_test_cases.yaml vendored
View File

@ -37,11 +37,6 @@ jobs:
run: |
scripts/get-dep-refs.sh
make clean-all
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: source/_build/default/lib/rocksdb/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:
@ -131,11 +126,6 @@ jobs:
run: |
scripts/get-dep-refs.sh
make clean-all
- name: load rocksdb cache
uses: actions/cache@v2
with:
path: source/_build/default/lib/rocksdb/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
- name: load quicer cache
uses: actions/cache@v2
with:

2
mix.exs
View File

@ -54,7 +54,7 @@ defmodule EMQXUmbrella.MixProject do
{:jiffy, github: "emqx/jiffy", tag: "1.0.5", override: true},
{:cowboy, github: "emqx/cowboy", tag: "2.9.0", override: true},
{:esockd, github: "emqx/esockd", tag: "5.9.1", override: true},
{:mria, github: "emqx/mria", tag: "0.2.0", override: true},
{:mria, github: "emqx/mria", tag: "0.2.1", override: true},
{:ekka, github: "emqx/ekka", tag: "0.12.1", override: true},
{:gen_rpc, github: "emqx/gen_rpc", tag: "2.8.0", override: true},
{:minirest, github: "emqx/minirest", tag: "1.2.12", override: true},

2
rebar.config
View File

@ -53,7 +53,7 @@
, {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}}
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.9.1"}}}
, {mria, {git, "https://github.com/emqx/mria", {tag, "0.2.0"}}}
, {mria, {git, "https://github.com/emqx/mria", {tag, "0.2.1"}}}
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.12.1"}}}
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.8.0"}}}
, {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.2.12"}}}

1
scripts/get-dep-refs.sh
View File

@ -7,5 +7,4 @@ get_ref() {
}
rebar3 get-deps
echo "::set-output name=DEP_ROCKSDB_REF::$(get_ref rocksdb)"
echo "::set-output name=DEP_QUICER_REF::$(get_ref quicer)"