From a5945c9e5924aa0b6fe352e2bf22896b586eb429 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Wed, 19 Jul 2023 21:40:04 -0500 Subject: [PATCH 1/3] Back to Github-based actions. (#453) * Back to Github-based actions. * Use fork. * Use new release plugin tag. --- .gitea/workflows/fixturenet-eth-test.yml | 2 +- .gitea/workflows/publish.yml | 4 ++-- .gitea/workflows/test-deploy.yml | 2 +- .gitea/workflows/test.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index 6b764664..43572c92 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -12,7 +12,7 @@ jobs: - name: "Clone project repository" uses: actions/checkout@v3 - name: "Install Python" - uses: cerc-io/setup-python@v4 + uses: actions/setup-python@v4 with: python-version: '3.8' - name: "Print Python version" diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index c86713ce..fb45c27e 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -19,7 +19,7 @@ jobs: build_tag=$(./scripts/create_build_tag_file.sh) echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT - name: "Install Python" - uses: cerc-io/setup-python@v4 + uses: actions/setup-python@v4 with: python-version: '3.8' - name: "Print Python version" @@ -37,7 +37,7 @@ jobs: run: | cp ${{ steps.build.outputs.package-file }} ./laconic-so - name: "Create release" - uses: cerc-io/action-gh-release@gitea-v1 + uses: https://gitea.com/cerc-io/action-gh-release@gitea-v2 with: tag_name: ${{ steps.build-info.outputs.build-tag }} # On the publish test branch, mark our release as a draft diff --git a/.gitea/workflows/test-deploy.yml b/.gitea/workflows/test-deploy.yml index 72b5a892..5ac5b450 100644 --- a/.gitea/workflows/test-deploy.yml +++ b/.gitea/workflows/test-deploy.yml @@ -20,7 +20,7 @@ jobs: - name: "Clone project repository" uses: actions/checkout@v3 - name: "Install Python" - uses: cerc-io/setup-python@v4 + uses: actions/setup-python@v4 with: python-version: '3.8' - name: "Print Python version" diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 56718e2a..303b42f4 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -20,7 +20,7 @@ jobs: - name: "Clone project repository" uses: actions/checkout@v3 - name: "Install Python" - uses: cerc-io/setup-python@v4 + uses: actions/setup-python@v4 with: python-version: '3.8' - name: "Print Python version" From 54f50aa09e8b6a75cd0e073846a4eb53d0a754b9 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 20 Jul 2023 05:37:51 -0600 Subject: [PATCH 2/3] Move files into config subdirectory (#460) --- app/data/compose/docker-compose-fixturenet-optimism.yml | 6 +++--- .../optimism-contracts}/hardhat-tasks/rekey-json.ts | 0 .../optimism-contracts}/hardhat-tasks/send-balance.ts | 0 .../hardhat-tasks/verify-contract-deployment.ts | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename app/data/{container-build/cerc-optimism-contracts => config/optimism-contracts}/hardhat-tasks/rekey-json.ts (100%) rename app/data/{container-build/cerc-optimism-contracts => config/optimism-contracts}/hardhat-tasks/send-balance.ts (100%) rename app/data/{container-build/cerc-optimism-contracts => config/optimism-contracts}/hardhat-tasks/verify-contract-deployment.ts (100%) diff --git a/app/data/compose/docker-compose-fixturenet-optimism.yml b/app/data/compose/docker-compose-fixturenet-optimism.yml index 9d7d99dd..c5804a14 100644 --- a/app/data/compose/docker-compose-fixturenet-optimism.yml +++ b/app/data/compose/docker-compose-fixturenet-optimism.yml @@ -24,9 +24,9 @@ services: "./wait-for-it.sh -h ${CERC_L1_HOST:-$${DEFAULT_CERC_L1_HOST}} -p ${CERC_L1_PORT:-$${DEFAULT_CERC_L1_PORT}} -s -t 60 -- ./run.sh" volumes: - ../config/network/wait-for-it.sh:/app/packages/contracts-bedrock/wait-for-it.sh - - ../container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts - - ../container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts - - ../container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts + - ../config/optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts + - ../config/optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts + - ../config/optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts - ../config/fixturenet-optimism/optimism-contracts/update-config.js:/app/packages/contracts-bedrock/update-config.js - ../config/fixturenet-optimism/optimism-contracts/run.sh:/app/packages/contracts-bedrock/run.sh - l2_accounts:/l2-accounts diff --git a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts b/app/data/config/optimism-contracts/hardhat-tasks/rekey-json.ts similarity index 100% rename from app/data/container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts rename to app/data/config/optimism-contracts/hardhat-tasks/rekey-json.ts diff --git a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts b/app/data/config/optimism-contracts/hardhat-tasks/send-balance.ts similarity index 100% rename from app/data/container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts rename to app/data/config/optimism-contracts/hardhat-tasks/send-balance.ts diff --git a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts b/app/data/config/optimism-contracts/hardhat-tasks/verify-contract-deployment.ts similarity index 100% rename from app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts rename to app/data/config/optimism-contracts/hardhat-tasks/verify-contract-deployment.ts From 950857fa846c9586f652949fd9078b907b9d7a8c Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 20 Jul 2023 06:25:31 -0600 Subject: [PATCH 3/3] Add --delete-volumes option to the down command (#461) --- app/deployment.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/deployment.py b/app/deployment.py index ccb11f51..eef12222 100644 --- a/app/deployment.py +++ b/app/deployment.py @@ -85,12 +85,13 @@ def down(ctx, delete_volumes, extra_args): # stop is the preferred alias for down @command.command() +@click.option("--delete-volumes/--preserve-volumes", default=False, help="delete data volumes") @click.argument('extra_args', nargs=-1) # help: command: down @click.pass_context -def stop(ctx, extra_args): +def stop(ctx, delete_volumes, extra_args): # TODO: add cluster name and env file here ctx.obj = make_deploy_context(ctx) - down_operation(ctx, extra_args, None) + down_operation(ctx, delete_volumes, extra_args, None) @command.command()