Skip to content

Commit

Permalink
Merge branch 'stage' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
l-monninger committed Feb 1, 2024
2 parents 92665b6 + c432eb3 commit 55f2ed7
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 19 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:


pre-release-x86_64-mac:
if: true # testing
if: false
needs: prepare-release
runs-on:
labels: macos-latest
Expand Down Expand Up @@ -210,7 +210,6 @@ jobs:


pre-release-aarch64-linux:
if: true # testing
needs: prepare-release
runs-on:
labels: buildjet-8vcpu-ubuntu-2204-arm
Expand Down Expand Up @@ -256,7 +255,8 @@ jobs:

pre-release-aarch64-mac:
# this is expensive, so only run on stage and main
if: github.ref == 'refs/heads/stage' || github.ref == 'refs/heads/main'
# if: github.ref == 'refs/heads/stage' || github.ref == 'refs/heads/main'
if: false
needs: prepare-release
runs-on: macos-latest-xlarge
steps:
Expand All @@ -276,7 +276,7 @@ jobs:
pre-release-x86_64-windows:
if: true # testing
if: false
needs: prepare-release
runs-on:
labels: windows-latest
Expand Down Expand Up @@ -389,7 +389,7 @@ jobs:
bash <(curl -fsSL https://raw.githubusercontent.com/movemntdev/M1/main/scripts/install.sh) --version ${{ needs.prepare-release.outputs.release_tag }}
echo "~/.movement/bin" >> $GITHUB_PATH
- name: Navigate and Run Movement Test
- name: Navigate and Run Movement Aptos Test
run: |
echo $GITHUB_PATH
cd examples/movement/data_structures
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
[submodule "ed25519-dalek"]
path = vendors/ed25519-dalek
url = https://github.com/movemntdev/ed25519-dalek
[submodule "aptos-pre-core-v2"]
path = vendors/aptos-core-1.7
url = https://github.com/movemntdev/aptos-core
branch = testnet
[submodule "aptos-core-v2"]
path = vendors/aptos-core-v2
url = https://github.com/movemntdev/aptos-core
Expand Down
2 changes: 1 addition & 1 deletion m1/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.71.1
1.73.0
2 changes: 1 addition & 1 deletion movement-sdk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion movement-sdk/clis/movement/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "movement"
version = "0.1.0"
version = "0.2.83"
edition = "2021"

[dependencies]
Expand Down
10 changes: 4 additions & 6 deletions scripts/movementctl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,10 @@ function start_avalanchego() {

# Starts the avalanche-network-runner server
function start_avalanche_network_runner() {
if [[ $RUN_IN_FOREGROUND == "true" ]]; then
SUBNET_TIMEOUT=10000000000000 $HOME/.movement/M1/m1/run.debug.sh
else
SUBNET_TIMEOUT=10000000000000 $HOME/.movement/M1/m1/run.debug.sh &
echo $! >> "$PID_DIR/avalanche_network_runner.pid"
fi

cd $HOME/.movement/M1/m1
$HOME/.movement/M1/m1/run.debug.sh

}

# Starts the subnet-request-proxy Node.js server
Expand Down
1 change: 0 additions & 1 deletion vendors/aptos-core-1.7
Submodule aptos-core-1.7 deleted from d20fab

0 comments on commit 55f2ed7

Please sign in to comment.