diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c0eba98..752044ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -451,6 +451,7 @@ jobs: image: ubuntu-2004:202010-01 environment: SNAPSHOT: SNAPSHOT_MIN_EXIT_PERIOD_SECONDS_120 + OPENAPI_GENERATOR_VERSION: 5.3.1 parallelism: 4 steps: - checkout @@ -497,6 +498,7 @@ jobs: -e ETHEREUM_WS_URL=ws://172.27.0.108:81 \ -e EXIT_ID_SIZE=160 \ -e SHELL=/bin/sh \ + -e OPENAPI_GENERATOR_VERSION=5.3.1 \ -v $(pwd):/app \ --entrypoint /bin/sh \ "omisego/childchain-builder:dev-6b9e25f" -c "cd /app/priv/cabbage && apk add maven && apk add jq && make install && make generate_api_code && mix deps.get && mix test ${TESTFILES} --trace" @@ -667,10 +669,10 @@ jobs: environment: CHART_NAME: childchain HELM_CHART_REPO: helm-development - UPDATE_DEV: false + UPDATE_DEV: true steps: - checkout - - run: APP_VERSION="${CIRCLE_TAG#*v}" sh .circleci/ci_increase_chart_version.sh + - run: APP_VERSION="$(echo "$CIRCLE_SHA1" | head -c 7)" sh .circleci/ci_increase_chart_version.sh notify_services: executor: builder_pg diff --git a/mix.exs b/mix.exs index 6b2933d5..91cb2d76 100644 --- a/mix.exs +++ b/mix.exs @@ -14,8 +14,7 @@ defmodule OMG.Umbrella.MixProject do dialyzer: dialyzer(), test_paths: test_paths(), aliases: aliases(), - # Docs - source_url: "https://github.com/omisego/elixir-omg", + source_url: "https://github.com/omgnetwork/elixir-omg", version: current_version(), releases: [ child_chain: [ diff --git a/mix.lock b/mix.lock index a9415ba4..d7c8f5d4 100644 --- a/mix.lock +++ b/mix.lock @@ -24,7 +24,7 @@ "exexec": {:hex, :exexec, "0.2.0", "a6ffc48cba3ac9420891b847e4dc7120692fb8c08c9e82220ebddc0bb8d96103", [:mix], [{:erlexec, "~> 1.10", [hex: :erlexec, repo: "hexpm", optional: false]}], "hexpm", "312cd1c9befba9e078e57f3541e4f4257eabda6eb9c348154fe899d6ac633299"}, "fake_server": {:hex, :fake_server, "2.1.0", "aefed08a587e2498fdb39ac9de6f9eabbe7bd83da9801d08d3574d61b7eb03d5", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "3200d57a523b27d2c8ebfc1a80b76697b3c8a06bf9d678d82114f5f98d350c75"}, "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"}, - "gas": {:git, "https://github.com/omgnetwork/gas.git", "7cd53f85b60aa93b0ad0e450b70913a9c2d1a741", [branch: "main"]}, + "gas": {:git, "https://github.com/omgnetwork/gas.git", "accd749ad08a2f29d1c0166cd17f9046b7a03179", [branch: "main"]}, "hackney": {:hex, :hackney, "1.16.0", "5096ac8e823e3a441477b2d187e30dd3fff1a82991a806b2003845ce72ce2d84", [:rebar3], [{:certifi, "2.5.2", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.1", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.0", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.6", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "3bf0bebbd5d3092a3543b783bf065165fa5d3ad4b899b836810e513064134e18"}, "httpoison": {:hex, :httpoison, "1.7.0", "abba7d086233c2d8574726227b6c2c4f6e53c4deae7fe5f6de531162ce9929a0", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "975cc87c845a103d3d1ea1ccfd68a2700c211a434d8428b10c323dc95dc5b980"}, "idna": {:hex, :idna, "6.0.1", "1d038fb2e7668ce41fbf681d2c45902e52b3cb9e9c77b55334353b222c2ee50c", [:rebar3], [{:unicode_util_compat, "0.5.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a02c8a1c4fd601215bb0b0324c8a6986749f807ce35f25449ec9e69758708122"},