diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml index edcdd470..d2d1d536 100644 --- a/.github/workflows/docker_build.yaml +++ b/.github/workflows/docker_build.yaml @@ -17,7 +17,8 @@ jobs: - name: Set outputs id: vars - run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" + run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Login to GAR run: | gcloud auth configure-docker us-docker.pkg.dev -q @@ -29,11 +30,11 @@ jobs: id: set_version run: | if [[ ${{ github.ref }} =~ "refs/tags" ]]; then - echo "::set-output name=image_tag_suffix::${GITHUB_REF#refs/*/}" + echo "image_tag_suffix=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT else sha=$(git rev-parse --short HEAD) ts=$(date +%s%N | cut -b1-13) - echo "::set-output name=image_tag_suffix::${sha}-${ts}" + echo "image_tag_suffix=${sha}-${ts}" >> $GITHUB_OUTPUT fi - name: Log in to Docker Hub uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0 diff --git a/.github/workflows/load_testing.yaml b/.github/workflows/load_testing.yaml index 9d33dadc..4530184e 100644 --- a/.github/workflows/load_testing.yaml +++ b/.github/workflows/load_testing.yaml @@ -51,7 +51,6 @@ jobs: - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3 with: node-version: 16 - token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Terraform uses: hashicorp/setup-terraform@v2 diff --git a/.github/workflows/protobuf_conformance.yaml b/.github/workflows/protobuf_conformance.yaml index 6545a131..d6a29b5d 100644 --- a/.github/workflows/protobuf_conformance.yaml +++ b/.github/workflows/protobuf_conformance.yaml @@ -16,7 +16,7 @@ env: jobs: conformance: - runs-on: ubuntu-latest + runs-on: [ubuntu-22.04-github-hosted-16core] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 215a84c0..30b552c1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -20,7 +20,7 @@ env: jobs: check-build-test: - runs-on: ubuntu-latest + runs-on: [ubuntu-22.04-github-hosted-16core] defaults: run: diff --git a/docker/localenv.Dockerfile b/docker/localenv.Dockerfile index b1c81e33..029be8bd 100644 --- a/docker/localenv.Dockerfile +++ b/docker/localenv.Dockerfile @@ -24,7 +24,7 @@ RUN cargo run -p tools --bin localnet_config -- --nodes=$nodes WORKDIR /usr/src/myapp/node RUN cargo build -p executor --release -# Create the artifacts directory +# Create the artifacts directory WORKDIR /usr/src/myapp/node/ RUN i=0; \ while [ $i -lt $nodes ]; do \ @@ -57,5 +57,5 @@ RUN i=0; \ i=$(expr $i + 1); \ done -# Some rundom command -CMD ["echo", "Done"] \ No newline at end of file +# Report succes +CMD ["echo", "Done"] diff --git a/infrastructure/loadtests/outputs.tf b/infrastructure/loadtests/outputs.tf index 3674e9b7..a8d6d350 100644 --- a/infrastructure/loadtests/outputs.tf +++ b/infrastructure/loadtests/outputs.tf @@ -1,9 +1,9 @@ - output "instance_public_ips" { description = "Public IPs of the instances" value = [for instance in google_compute_instance.zksync_bft_node : instance.network_interface[0].access_config[0].nat_ip] } output "ssh_key" { - value = tls_private_key.ssh.public_key_openssh + value = tls_private_key.ssh.public_key_openssh + sensitive = true }