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

Merge pull request #8244 from zmstone/0616-pin-quic-0.0.12-make-user-of-build-cache 

0616 pin quic 0.0.12 make use of build cache
This commit is contained in:
Zaiming (Stone) Shi 2022-06-16 14:10:19 +01:00 committed by GitHub
parent a2a4c813e7 b3182609c3
commit 72cbe5c831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 4 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,19 +50,6 @@ jobs:
run: |
echo "EMQX_NAME=${{ matrix.profile }}" >> $GITHUB_ENV
echo "CODE_PATH=$GITHUB_WORKSPACE" >> $GITHUB_ENV
- name: Get deps git refs for cache
id: deps-refs
run: |
git config --global --add safe.directory "/__w/emqx/emqx"
scripts/get-dep-refs.sh
make clean-all
- name: load quicer cache
uses: actions/cache@v2
with:
path: |
_build/default/lib/quicer/
deps/quicer/
key: ${{ matrix.os }}-${{ matrix.elixir }}-${{ matrix.otp }}-amd64-${{ steps.deps-refs.outputs.DEP_QUICER_REF }}
- name: Work around https://github.com/actions/checkout/issues/766
run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
@ -171,21 +158,6 @@ jobs:
kerl update releases
kerl build ${{ matrix.otp }}
kerl install ${{ matrix.otp }} $HOME/.kerl/${{ matrix.otp }}
- name: Get deps git refs for cache
id: deps-refs
env:
AUTO_INSTALL_BUILD_DEPS: 1
run: |
. $HOME/.kerl/${{ matrix.otp }}/activate
make ensure-rebar3
sudo cp rebar3 /usr/local/bin/rebar3
scripts/get-dep-refs.sh
make clean-all
- name: load quicer cache
uses: actions/cache@v2
with:
path: _build/default/lib/quicer/
key: ${{ matrix.macos }}-${{ matrix.otp }}-macos-${{ steps.deps-refs.outputs.DEP_QUICER_REF }}
- name: build ${{ matrix.profile }}
env:
AUTO_INSTALL_BUILD_DEPS: 1

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

@ -34,16 +34,6 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Get deps git refs for cache
id: deps-refs
run: |
PATH=$PATH:./ scripts/get-dep-refs.sh
make clean-all
- name: load quicer cache
uses: actions/cache@v2
with:
path: _build/default/lib/quicer/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_QUICER_REF }}
- name: run
run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"

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

@ -65,21 +65,6 @@ jobs:
- name: unzip source code
run: unzip -q source.zip
- name: Get deps git refs for cache
id: deps-refs
run: |
cd source
make ensure-rebar3
sudo cp rebar3 /usr/local/bin/rebar3
scripts/get-dep-refs.sh
- name: load quicer cache
uses: actions/cache@v2
with:
path: |
source/_build/default/lib/quicer/
source/deps/quicer/
key: ${{ matrix.os[0] }}-${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_QUICER_REF }}
- name: make docker image
working-directory: source
env:
@ -151,18 +136,6 @@ jobs:
path: .
- name: unzip source code
run: unzip -q source.zip
- name: Get deps git refs for cache
id: deps-refs
run: |
cd source
make ensure-rebar3
sudo cp rebar3 /usr/local/bin/rebar3
scripts/get-dep-refs.sh
- name: load quicer cache
uses: actions/cache@v2
with:
path: source/_build/default/lib/quicer/
key: ${{ matrix.os[0] }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_QUICER_REF }}
- name: make docker image
working-directory: source

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

@ -72,18 +72,6 @@ jobs:
- name: Get old vsn
run: echo "OLD_VSNS=$(emqx/scripts/relup-base-vsns.sh ${{ matrix.profile }} | xargs echo -n)" >> $GITHUB_ENV
- name: Get deps git refs for cache
id: deps-refs
run: |
cd emqx
scripts/get-dep-refs.sh
- name: load quicer cache
uses: actions/cache@v2
with:
path: emqx/_build/default/lib/quicer/
key: ${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.arch }}-${{ steps.deps-refs.outputs.DEP_QUICER_REF }}
- name: build emqx
env:
PROFILE: ${{ matrix.profile }}

1
Makefile
View File

@ -9,6 +9,7 @@ export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh)
export ELIXIR_VSN ?= $(shell $(CURDIR)/scripts/get-elixir-vsn.sh)
export EMQX_DASHBOARD_VERSION ?= v0.36.0
export EMQX_REL_FORM ?= tgz
export QUICER_DOWNLOAD_FROM_RELEASE = 1
ifeq ($(OS),Windows_NT)
export REBAR_COLOR=none
FIND=/usr/bin/find

2
apps/emqx/rebar.config.script
View File

@ -24,7 +24,7 @@ IsQuicSupp = fun() ->
end,
Bcrypt = {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.0"}}},
Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.11"}}}.
Quicer = {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.12"}}}.
ExtraDeps = fun(C) ->
{deps, Deps0} = lists:keyfind(deps, 1, C),

2
mix.exs
View File

@ -591,7 +591,7 @@ defmodule EMQXUmbrella.MixProject do
defp quicer_dep() do
if enable_quicer?(),
# in conflict with emqx and emqtt
do: [{:quicer, github: "emqx/quic", tag: "0.0.11", override: true}],
do: [{:quicer, github: "emqx/quic", tag: "0.0.12", override: true}],
else: []
end

2
rebar.config.erl
View File

@ -38,7 +38,7 @@ bcrypt() ->
{bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.0"}}}.
quicer() ->
{quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.11"}}}.
{quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.12"}}}.
jq() ->
{jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.4"}}}.

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

@ -1,10 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
get_ref() {
local APP=$1
#echo "{ok,Raw}=file:consult(\"rebar.lock\"), {_Vsn, Deps}=hd(Raw), {_, {git, _Url, {ref, Ref}},_} = lists:keyfind(<<\"${APP}\">>,1, Deps), io:format(\"~s\",[Ref]), init:stop()."
erl -noshell -eval "{ok,Raw}=file:consult(\"rebar.lock\"), {_Vsn, Deps}=hd(Raw), {_, {git, _Url, {ref, Ref}},_} = lists:keyfind(<<\"${APP}\">>,1, Deps), io:format(\"~s\",[Ref]), init:stop()."
}
rebar3 get-deps
echo "::set-output name=DEP_QUICER_REF::$(get_ref quicer)"