Skip to content

Commit

Permalink
Merge branch 'master' into Update-SecurityMD-OutOfScope
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronmgdr authored Jul 13, 2023
2 parents 71dd3af + 5023851 commit 0d8a2b8
Show file tree
Hide file tree
Showing 225 changed files with 3,852 additions and 11,586 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ jobs:
mkdir -p ~/.ssh
ssh-keyscan github.com >> ~/.ssh/known_hosts
echo "Comparing against $RELEASE_TAG"
# Github has phased out the git protocol so we ensure that we use
# Github has phased out the http protocol so we ensure that we use
# https for all git operations that yarn may perform.
git config --global url."https://github.com".insteadOf git://github.com
yarn --cwd packages/protocol test:generate-old-devchain-and-build -b $RELEASE_TAG -d .tmp/released_chain -l /dev/stdout -g scripts/truffle/releaseGoldExampleConfigs.json
Expand Down
2 changes: 0 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ GETH_VMODULE="consensus/*=2"
GETH_ENABLE_METRICS=false
GETH_USE_MYCELO=false

VM_BASED=false

KUBERNETES_CLUSTER_NAME="celo-networks-dev"
KUBERNETES_CLUSTER_ZONE="us-west1-a"
CLUSTER_DOMAIN_NAME="celo-networks-dev"
Expand Down
2 changes: 0 additions & 2 deletions .env.alfajores
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ ENV_TYPE="production"

GETH_VERBOSITY=2

VM_BASED=false

KUBERNETES_CLUSTER_NAME="alfajores"
KUBERNETES_CLUSTER_ZONE="us-west1-a"
CLUSTER_DOMAIN_NAME="celo-testnet"
Expand Down
1 change: 0 additions & 1 deletion .env.baklava
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ ENV_TYPE="production"
GETH_VERBOSITY=2
GETH_ENABLE_METRICS=true

VM_BASED=false

KUBERNETES_CLUSTER_NAME="baklavastaging"
KUBERNETES_CLUSTER_ZONE="us-west1-a"
Expand Down
1 change: 0 additions & 1 deletion .env.oracledev
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ CLUSTER_CREATION_FLAGS="--enable-autoscaling --min-nodes 3 --max-nodes 8 --machi

# ---- VM ----

VM_BASED=false

# ---- Blockscout ----

Expand Down
3 changes: 0 additions & 3 deletions .env.rc1staging
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ ENV_TYPE="staging"
GETH_VERBOSITY=2
GETH_ENABLE_METRICS=true

# TODO: deprecated
VM_BASED=false

KUBERNETES_CLUSTER_NAME="rc1staging"
KUBERNETES_CLUSTER_ZONE="us-west1-a"
CLUSTER_DOMAIN_NAME="celo-testnet"
Expand Down
1 change: 0 additions & 1 deletion .env.staging
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ GETH_NODE_DOCKER_IMAGE_TAG="8a44c2cd92200bdffce595c7558e84a39ea2bc15"

GETH_VERBOSITY=2

VM_BASED=false

KUBERNETES_CLUSTER_NAME=celo-networks-dev
KUBERNETES_CLUSTER_ZONE="us-west1-a"
Expand Down
20 changes: 20 additions & 0 deletions .github/actions/protocol-sync-workspace/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "Sync workspace for protocol tests"
description: "Sync workspace for protocol tests"
inputs:
package-json-checksum:
description: "Checksum of package.json"
required: true
runs:
using: "composite"
steps:
- name: Sync workspace
uses: ./.github/actions/sync-workspace
with:
package-json-checksum: ${{ inputs.package-json-checksum }}
- uses: actions/cache/restore@v3
id: cache_protocol
with:
path: packages/protocol/.tmp/released_chain
key: protocol-${{ github.sha }}
enableCrossOsArchive: true
fail-on-cache-miss: true
54 changes: 54 additions & 0 deletions .github/actions/sync-workspace/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: "Sync workspace"
description: "Sync GitHub Action workspace using GitHub cache"
inputs:
package-json-checksum:
description: "Checksum of package.json"
required: true
rebuild-package:
description: "Rebuild package. It also disable fail-on-cache-miss"
required: false
default: 'false'
runs:
using: "composite"
steps:
- uses: actions/cache/restore@v3
id: cache_node
env:
REBUILD_PACKAGE: ${{ inputs.rebuild-package }}
with:
path: |
node_modules
packages/**/node_modules
key: node-${{ runner.os }}-${{ runner.arch }}-${{ env.NODE_MODULE_CACHE_VERSION }}-${{ hashFiles('**/yarn.lock') }}-${{ inputs.package-json-checksum }}
enableCrossOsArchive: true
fail-on-cache-miss: "!${{ fromJSON(env.REBUILD_PACKAGE) }}"
- name: Restore build artifacts cache
uses: actions/cache/restore@v3
id: cache_build_artifacts
env:
REBUILD_PACKAGE: ${{ inputs.rebuild-package }}
with:
# We need to cache all the artifacts generated by yarn install+build
# Update this list also in .github/actions/sync-workspace/action.yml with exactly the same list
path: |
packages/**/lib
packages/**/dist
packages/**/build
packages/protocol/*.js
packages/protocol/*.js.map
packages/protocol/**/*.js
packages/protocol/**/*.js.map
packages/sdk/contractkit/src/generated
key: code-${{ github.sha }}
restore-keys: |
code-${{ github.sha }}
enableCrossOsArchive: true
fail-on-cache-miss: "!${{ fromJSON(env.REBUILD_PACKAGE) }}"
- name: Rebuild package
shell: bash --login -eo pipefail {0}
env:
REBUILD_PACKAGE: ${{ inputs.rebuild-package }}
if: ${{ fromJSON(env.REBUILD_PACKAGE) }}
run: |
yarn install
yarn build --ignore docs --include-dependencies
Loading

0 comments on commit 0d8a2b8

Please sign in to comment.