Skip to content

Commit

Permalink
Merge 7335348 into 8ab220a
Browse files Browse the repository at this point in the history
  • Loading branch information
twoeths authored Jan 13, 2023
2 parents 8ab220a + 7335348 commit 4f6d347
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 70 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
node-version: 18
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
node-version: 18
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
registry-url: "https://registry.npmjs.org"
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand All @@ -46,7 +46,7 @@ jobs:
PACKAGE_VERSION=$(node -p "require('./packages/cli/package.json').version")
NEXT_VERSION=$(npx --yes semver --increment minor $PACKAGE_VERSION)
export VERSION=${NEXT_VERSION}-dev.${GITHUB_SHA:0:10}
echo "::set-output name=version::$VERSION"
echo "version=$VERSION" >> $GITHUB_OUTPUT
echo PACKAGE_VERSION $PACKAGE_VERSION GITHUB_SHA $GITHUB_SHA VERSION $VERSION
- name: Change and commit version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- name: Get tag
id: get_tag
run: echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//}
run: echo "tag=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT

- name: Get previous tag
id: get_prev_tag
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
node-version: 18
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- name: Get tag
id: get_tag
run: echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//}
run: echo "tag=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT

- name: Assert tag == package.json version
run: .github/workflows/scripts/assert-same-package-version.sh
Expand All @@ -40,8 +40,8 @@ jobs:
run: |
STABLE_COMMIT=$(git log --pretty="%h" -n 1 refs/remotes/origin/stable)
TAG_COMMIT=$(git log --pretty="%h" -n 1 $GITHUB_REF)
echo ::set-output name=stable_commit::$STABLE_COMMIT
echo ::set-output name=tag_commit::$TAG_COMMIT
echo "stable_commit=$STABLE_COMMIT" >> $GITHUB_OUTPUT
echo "tag_commit=$TAG_COMMIT" >> $GITHUB_OUTPUT
outputs:
is_stable: ${{ steps.release_type.outputs.stable_commit == steps.release_type.outputs.tag_commit }}
Expand All @@ -63,7 +63,7 @@ jobs:
node-version: 18
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-browser.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Browser tests

on:
on:
push:
# We intentionally don't run push on feature branches. See PR for rational.
# We intentionally don't run push on feature branches. See PR for rational.
branches: [unstable, stable]
pull_request:
workflow_dispatch:
Expand All @@ -26,7 +26,7 @@ jobs:
node-version: ${{matrix.node}}
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: E2E tests

on:
on:
push:
# We intentionally don't run push on feature branches. See PR for rational.
# We intentionally don't run push on feature branches. See PR for rational.
branches: [unstable, stable]
pull_request:
workflow_dispatch:
Expand All @@ -26,7 +26,7 @@ jobs:
node-version: ${{matrix.node}}
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-sim-merge.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Sim merge execution/builder tests

on:
on:
push:
# We intentionally don't run push on feature branches. See PR for rational.
# We intentionally don't run push on feature branches. See PR for rational.
branches: [unstable, stable]
pull_request:
workflow_dispatch:
Expand All @@ -27,7 +27,7 @@ jobs:
node-version: 18
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
name: debug-test-logs
path: packages/beacon-node/test-logs

- name: Pull geth withdrawals
- name: Pull geth withdrawals
run: docker pull $GETH_WITHDRAWALS_IMAGE

- name: Test Lodestar <> geth withdrawals
Expand All @@ -99,7 +99,7 @@ jobs:
EL_BINARY_DIR: ${{ env.GETH_WITHDRAWALS_IMAGE }}
EL_SCRIPT_DIR: gethdocker

- name: Pull ethereumjs withdrawals
- name: Pull ethereumjs withdrawals
run: docker pull $ETHEREUMJS_WITHDRAWALS_IMAGE

- name: Test Lodestar <> ethereumjs withdrawals
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-sim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
node-version: 18
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
node-version: 18
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
node-version: ${{matrix.node}}
- name: Node.js version
id: node
run: echo "::set-output name=v8CppApiVersion::$(node --print "process.versions.modules")"
run: echo "v8CppApiVersion=$(node --print "process.versions.modules")" >> $GITHUB_OUTPUT
- name: Restore dependencies
uses: actions/cache@master
id: cache-deps
Expand Down
44 changes: 0 additions & 44 deletions scripts/release/assert_valid_rc.mjs

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/release/assert_valid_rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ HEAD_COMMIT=$(git rev-parse refs/remotes/origin/$RC_BRANCH)
git merge-base --is-ancestor $COMMIT $HEAD_COMMIT

# success
echo "::set-output name=is_rc::true"
echo "::set-output name=version::$VERSION"
echo "is_rc=true" >> $GITHUB_OUTPUT
echo "version=$VERSION" >> $GITHUB_OUTPUT

0 comments on commit 4f6d347

Please sign in to comment.