Skip to content

Merge master to berkeley #15726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Jun 10, 2024
Merged

Merge master to berkeley #15726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1a8adfa
Empty commit to signpost the 1.4.0beta3 Release
Jun 7, 2023
edb4deb
Empty commit to signpost 1.4.0 Release
Aug 1, 2023
2ff4efa
Deleting files related to Test-Publish client SDK to npm
vanarasiantonyswamy Aug 2, 2023
f6bff34
Update cronjob to remove v1beta1 to v1
vanarasiantonyswamy Aug 2, 2023
a499c77
DockerTestExecutive fix
vanarasiantonyswamy Aug 2, 2023
70716be
Docker Test Executive fix
vanarasiantonyswamy Aug 3, 2023
fe211b9
remove Docker toolchain-stretch-docker-image
vanarasiantonyswamy Aug 3, 2023
aec82dd
Docker-toolchain-stretch-docker-image revert
vanarasiantonyswamy Aug 3, 2023
c28ebfe
remove toolchainstretch stretch
vanarasiantonyswamy Aug 3, 2023
fd88530
fix deb version merge conflict
stevenplatt Aug 15, 2023
d4ecec8
resolve conflict with run in toolchain file
stevenplatt Aug 15, 2023
a8e0f80
.
stevenplatt Aug 15, 2023
f4ae879
fix conflict - testexcutive.dhall file
stevenplatt Aug 15, 2023
1b2cb26
fix conflict - containerimages.dhall file
stevenplatt Aug 15, 2023
762edae
.
stevenplatt Aug 15, 2023
d87fbfc
.
stevenplatt Aug 15, 2023
f7a2c29
.
stevenplatt Aug 15, 2023
47fa84c
.
stevenplatt Aug 15, 2023
2f489f2
remove bionic release
stevenplatt Aug 15, 2023
85e522e
toolchain container version fix
stevenplatt Aug 15, 2023
cd9a485
Merge pull request #13826 from MinaProtocol/Vani-DockerFixes
stevenplatt Aug 15, 2023
adc9192
Merge branch 'master' into Vani-MainnetCIfixes
stevenplatt Aug 15, 2023
ed54a7b
Merge pull request #13822 from MinaProtocol/Vani-MainnetCIfixes
stevenplatt Aug 15, 2023
c980ba8
Empty commit to signpost 1.4.0.1 Release
vanarasiantonyswamy Aug 16, 2023
6e8121c
Empty commit to signpost 1.4.1beta1 Release
dkijania Jan 29, 2024
8dc9175
Merge remote-tracking branch 'origin/release/1.4.1'
amc-ie Mar 12, 2024
21acbdc
Empty commit to signpost 1.4.1 Stable Release
amc-ie Mar 12, 2024
efc5b3a
Don't show [DIRTY]
mrmr1993 Mar 14, 2024
ad8ed6e
Merge pull request #15331 from MinaProtocol/no-dirty
mrmr1993 Mar 14, 2024
e76fc1c
Empty commit to signpost 1.4.1 Release
dkijania Mar 14, 2024
c1c9687
Merge branch 'master' into berkeley
mrmr1993 Jun 10, 2024
917e574
Fixup merge error
mrmr1993 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buildkite/src/Command/RunInToolchain.dhall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ let runInToolchainBuster : List Text -> Text -> List Cmd.Type =
\(innerScript : Text) ->
runInToolchainImage ContainerImages.minaToolchainBuster environment innerScript


let runInToolchain : List Text -> Text -> List Cmd.Type =
\(environment : List Text) ->
\(innerScript : Text) ->
Expand Down
2 changes: 0 additions & 2 deletions src/lib/mina_version/normal/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ root="${MINA_ROOT-$(git rev-parse --show-toplevel || echo ../../../../../..)}"
pushd "$root" > /dev/null
id="${MINA_COMMIT_SHA1-$(git rev-parse --verify HEAD || echo "<unknown>")}"
commit_id_short="$(printf "%s" "$id" | cut -c1-8)"
if [[ -e .git ]] && ! git diff --quiet; then id="[DIRTY]$id"; fi
commit_date="${MINA_COMMIT_DATE-$(git show HEAD -s --format="%cI" || echo "<unknown>")}"

mina_submodule=$(git submodule status | grep "mina" || true)
Expand All @@ -20,7 +19,6 @@ pushd "$root" > /dev/null
fi
marlin_commit_id="${MARLIN_COMMIT_ID-$(git rev-parse --verify HEAD || echo "<unknown>")}"
marlin_commit_id_short="$(printf '%s' "$marlin_commit_id" | cut -c1-8)"
if [[ -e .git ]] && ! git diff --quiet; then marlin_commit_id="[DIRTY]$marlin_commit_id"; fi
marlin_commit_date="${MARLIN_COMMIT_DATE-$(git show HEAD -s --format="%cI" || echo "<unknown>")}"
popd > /dev/null
popd > /dev/null
Expand Down