From aa4f6c908ada7f80c0e64a53abc4913ea83cfae3 Mon Sep 17 00:00:00 2001 From: Carlo Mazzaferro Date: Fri, 22 Sep 2023 17:49:16 +0200 Subject: [PATCH] ci: deploy to prod (#4924) * fix: account for decimal precision differences (#4782) * fix: account for decimal precision differences * build: bump sdk core * fix: no multiply by 1e18 (#4822) * build: bump sdk core (#4826) * chore: add routers * fix: init script for xTokens (#4838) * fix: init * fix: mainnet fix && removed errors * fix: include all chains (#4851) * Chore: add alcx to test net (#4833) * config: Next tokens * feat: changed next assets * chore: add alcx Signed-off-by: hesnicewithit --------- Signed-off-by: hesnicewithit Co-authored-by: Layne Haber Co-authored-by: just-a-node * feat: add EURe to testnet allowlist (#4795) * feat: add EURe to testnet allowlist * Update production.ts * Update production.ts --------- Co-authored-by: Prathmesh Khandelwal <201952225@iiitvadodara.ac.in> * feat: add BTRST data (#4773) * feat: add BTRST data * add cap * this is only a xMonoTest test (#4798) Co-authored-by: Prathmesh <201952225@iiitvadodara.ac.in> * fix: fetch strategy - fallback * chore: rebuild graph-client * Merge pull request Whitelist NEXT xerc20s (#4855) * feat: add testnet NEXT xerc20 * feat: add mainnet NEXT xerc20 * fix: update testnet next * fix: update mainnet next * fix: uncomment * feat: update next contracts and increase cap * feat: new xerc20 for dappradar testnet (#4858) * Revert "Merge branch 'main' into testnet-prod" This reverts commit 00f4318197d5a406fdec9bc5d75b3e4289dceb9c, reversing changes made to 0c08528a00132b61c3b17bc46cf9027268f7ae5f. * fix: merge changes to sdk and init script from main * ci: deploy terraform state changes (#4907) * fix: control flow (#4911) * fix: maticjs version * fix: migrate state to new backend (#4901) * fix: migrate state to new backend * fix: staging state migration + fixes --------- Co-authored-by: Rahul Sethuram * fix: prod state migrations (#4903) * Fix/migrate state prod core (#4904) * fix: prod state migrations * fix: missing config * Fix/ci fix - remove flow control (#4910) * fix: remove ci stop check * fix: remove continue-on-error --------- Co-authored-by: Rahul Sethuram * Fix/merge conflict testnet prod resolution (#4918) * fix: maticjs version * fix: migrate state to new backend (#4901) * fix: migrate state to new backend * fix: staging state migration + fixes --------- Co-authored-by: Rahul Sethuram * fix: prod state migrations (#4903) * Fix/migrate state prod core (#4904) * fix: prod state migrations * fix: missing config * Fix/ci fix - remove flow control (#4910) * fix: remove ci stop check * fix: remove continue-on-error * Fix/tf version bump (#4914) * fix: bump tf version and fix warning * fix: terraform version bump --------- Co-authored-by: Rahul Sethuram * fix: terraform version (#4916) * fix: maticjs version * fix: migrate state to new backend (#4901) * fix: migrate state to new backend * fix: staging state migration + fixes --------- Co-authored-by: Rahul Sethuram * fix: prod state migrations (#4903) * Fix/migrate state prod core (#4904) * fix: prod state migrations * fix: missing config * Fix/ci fix - remove flow control (#4910) * fix: remove ci stop check * fix: remove continue-on-error * Fix/tf version bump (#4914) * fix: bump tf version and fix warning * fix: terraform version bump --------- Co-authored-by: Rahul Sethuram --------- Signed-off-by: hesnicewithit Co-authored-by: Eddie Co-authored-by: wanglonghong Co-authored-by: Rahul Sethuram Co-authored-by: Prathmesh Khandelwal <201952225@iiitvadodara.ac.in> Co-authored-by: Scrub Lord <90161049+Hesnicewithit@users.noreply.github.com> Co-authored-by: Layne Haber Co-authored-by: Maciek Co-authored-by: axlvaz <76085391+axlvaz@users.noreply.github.com> Co-authored-by: Liu <57480598+liu-zhipeng@users.noreply.github.com> Co-authored-by: preethamr --- .github/workflows/build-test-deploy.yml | 14 +++++++------- ops/infra/.terraform-version | 2 +- ops/mainnet/prod/backend/.terraform-version | 2 +- ops/mainnet/prod/core/.terraform-version | 2 +- ops/modules/networking/main.tf | 4 ++-- ops/testnet/prod/backend/.terraform-version | 2 +- ops/testnet/prod/core/.terraform-version | 2 +- ops/testnet/staging/backend/.terraform-version | 2 +- ops/testnet/staging/core/.terraform-version | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 2cbe602c9c..e257647e19 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -950,7 +950,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v1 with: - terraform_version: 1.1.7 + terraform_version: 1.5.7 - name: Checkout repository uses: actions/checkout@v3 @@ -990,7 +990,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v1 with: - terraform_version: 1.1.7 + terraform_version: 1.5.7 - name: Setup Sops uses: mdgreenwald/mozilla-sops-action@v1.2.0 @@ -1054,7 +1054,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v1 with: - terraform_version: 1.1.7 + terraform_version: 1.5.7 - name: Setup Sops uses: mdgreenwald/mozilla-sops-action@v1.2.0 @@ -1128,7 +1128,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v1 with: - terraform_version: 1.1.7 + terraform_version: 1.5.7 - name: Setup Sops uses: mdgreenwald/mozilla-sops-action@v1.2.0 @@ -1196,7 +1196,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v1 with: - terraform_version: 1.1.7 + terraform_version: 1.5.7 - name: Setup Sops uses: mdgreenwald/mozilla-sops-action@v1.2.0 @@ -1264,7 +1264,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v1 with: - terraform_version: 1.1.7 + terraform_version: 1.5.7 - name: Setup Sops uses: mdgreenwald/mozilla-sops-action@v1.2.0 @@ -1327,7 +1327,7 @@ jobs: - name: Setup Terraform uses: hashicorp/setup-terraform@v1 with: - terraform_version: 1.1.7 + terraform_version: 1.5.7 - name: Setup Sops uses: mdgreenwald/mozilla-sops-action@v1.2.0 diff --git a/ops/infra/.terraform-version b/ops/infra/.terraform-version index a5ba932511..f01291b87f 100644 --- a/ops/infra/.terraform-version +++ b/ops/infra/.terraform-version @@ -1 +1 @@ -1.1.7 \ No newline at end of file +1.5.7 diff --git a/ops/mainnet/prod/backend/.terraform-version b/ops/mainnet/prod/backend/.terraform-version index a5ba932511..f01291b87f 100644 --- a/ops/mainnet/prod/backend/.terraform-version +++ b/ops/mainnet/prod/backend/.terraform-version @@ -1 +1 @@ -1.1.7 \ No newline at end of file +1.5.7 diff --git a/ops/mainnet/prod/core/.terraform-version b/ops/mainnet/prod/core/.terraform-version index a5ba932511..f01291b87f 100644 --- a/ops/mainnet/prod/core/.terraform-version +++ b/ops/mainnet/prod/core/.terraform-version @@ -1 +1 @@ -1.1.7 \ No newline at end of file +1.5.7 diff --git a/ops/modules/networking/main.tf b/ops/modules/networking/main.tf index 571e831442..3dfc7ad361 100755 --- a/ops/modules/networking/main.tf +++ b/ops/modules/networking/main.tf @@ -1,7 +1,7 @@ data "aws_availability_zones" "available" {} resource "aws_vpc" "main" { - cidr_block = var.cidr_block + cidr_block = var.cidr_block enable_dns_hostnames = true tags = { Environment = var.environment @@ -47,7 +47,7 @@ resource "aws_route" "internet_access" { #Create a NAT gateway with an EIP for each private subnet to get internet connectivity resource "aws_eip" "gw" { count = var.az_count - vpc = true + domain = "vpc" depends_on = [aws_internet_gateway.main] } diff --git a/ops/testnet/prod/backend/.terraform-version b/ops/testnet/prod/backend/.terraform-version index a5ba932511..f01291b87f 100644 --- a/ops/testnet/prod/backend/.terraform-version +++ b/ops/testnet/prod/backend/.terraform-version @@ -1 +1 @@ -1.1.7 \ No newline at end of file +1.5.7 diff --git a/ops/testnet/prod/core/.terraform-version b/ops/testnet/prod/core/.terraform-version index a5ba932511..f01291b87f 100644 --- a/ops/testnet/prod/core/.terraform-version +++ b/ops/testnet/prod/core/.terraform-version @@ -1 +1 @@ -1.1.7 \ No newline at end of file +1.5.7 diff --git a/ops/testnet/staging/backend/.terraform-version b/ops/testnet/staging/backend/.terraform-version index a5ba932511..f01291b87f 100644 --- a/ops/testnet/staging/backend/.terraform-version +++ b/ops/testnet/staging/backend/.terraform-version @@ -1 +1 @@ -1.1.7 \ No newline at end of file +1.5.7 diff --git a/ops/testnet/staging/core/.terraform-version b/ops/testnet/staging/core/.terraform-version index a5ba932511..f01291b87f 100644 --- a/ops/testnet/staging/core/.terraform-version +++ b/ops/testnet/staging/core/.terraform-version @@ -1 +1 @@ -1.1.7 \ No newline at end of file +1.5.7