Skip to content

Commit 35f82d2

Browse files
JOYclaude
andcommitted
fix: restore upstream v10.0.0 version files from merge
Merge auto-resolution failed to take upstream's mix.exs, rel/config.exs, and docker/Makefile. Restored exact copies from upstream v10.0.0 commit (72aaaf5). Fixes version string, dependency versions (tesla, ex_doc), and code formatting. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent c3ca1e8 commit 35f82d2

3 files changed

Lines changed: 16 additions & 7 deletions

File tree

docker/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ STATS_CONTAINER_NAME := stats
1010
STATS_DB_CONTAINER_NAME := stats-db
1111
PROXY_CONTAINER_NAME := proxy
1212
PG_CONTAINER_NAME := postgres
13-
RELEASE_VERSION ?= '9.3.5'
13+
RELEASE_VERSION ?= '10.0.0'
1414
TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
1515
STABLE_TAG := $(RELEASE_VERSION)
1616

mix.exs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ defmodule BlockScout.Mixfile do
77
[
88
# app: :block_scout,
99
# aliases: aliases(config_env()),
10-
version: "9.3.5",
10+
version: "10.0.0",
1111
apps_path: "apps",
1212
deps: deps(),
1313
dialyzer: dialyzer(),
@@ -38,7 +38,12 @@ defmodule BlockScout.Mixfile do
3838

3939
defp copy_prod_runtime_config(%Mix.Release{path: path} = release) do
4040
File.mkdir_p!(Path.join([path, "config", "runtime"]))
41-
File.cp!(Path.join(["config", "runtime", "prod.exs"]), Path.join([path, "config", "runtime", "prod.exs"]))
41+
42+
File.cp!(
43+
Path.join(["config", "runtime", "prod.exs"]),
44+
Path.join([path, "config", "runtime", "prod.exs"])
45+
)
46+
4247
File.mkdir_p!(Path.join([path, "apps", "explorer", "config", "prod"]))
4348

4449
File.cp_r!(
@@ -47,7 +52,11 @@ defmodule BlockScout.Mixfile do
4752
)
4853

4954
File.mkdir_p!(Path.join([path, "apps", "indexer", "config", "prod"]))
50-
File.cp_r!(Path.join(["apps", "indexer", "config", "prod"]), Path.join([path, "apps", "indexer", "config", "prod"]))
55+
56+
File.cp_r!(
57+
Path.join(["apps", "indexer", "config", "prod"]),
58+
Path.join([path, "apps", "indexer", "config", "prod"])
59+
)
5160

5261
release
5362
end
@@ -96,10 +105,10 @@ defmodule BlockScout.Mixfile do
96105
[
97106
{:prometheus_ex, "~> 5.0.0", override: true},
98107
{:absinthe_plug, git: "https://github.com/blockscout/absinthe_plug.git", tag: "1.5.8", override: true},
99-
{:tesla, "~> 1.15.3"},
108+
{:tesla, "~> 1.16.0"},
100109
{:mint, "~> 1.7.1"},
101110
# Documentation
102-
{:ex_doc, "~> 0.39.1", only: :dev, runtime: false},
111+
{:ex_doc, "~> 0.40.1", only: :dev, runtime: false},
103112
{:number, "~> 1.0.3"}
104113
]
105114
end

rel/config.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ end
7171
# will be used by default
7272

7373
release :blockscout do
74-
set version: "9.3.5"
74+
set version: "10.0.0"
7575
set applications: [
7676
:runtime_tools,
7777
block_scout_web: :permanent,

0 commit comments

Comments
 (0)