Skip to content

Commit

Permalink
Bisect revert
Browse files Browse the repository at this point in the history
  • Loading branch information
mhofman committed Feb 16, 2024
1 parent a7d2113 commit 77bad99
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
**/node_modules
**/.git
docker
a3p-integration
coverage
packages/cosmic-swingset/t[0-9]
packages/cosmic-swingset/t[0-9].*
golang/cosmos/build
Expand All @@ -10,13 +12,16 @@ packages/stat-logger
**/deployment.json
**/vars.tf
**/*.log
**/dist
!packages/cosmic-proto/dist
**/build
**/bundles
**/__pycache__
**/*.egg-info
**/swingset-kernel-state
**/_agstate
.vagrant
endo-sha.txt
# When changing/adding entries here, make sure to search the whole project for
# `@@AGORIC_DOCKER_SUBMODULES@@`
packages/xsnap/moddable
Expand Down
8 changes: 7 additions & 1 deletion .github/actions/restore-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ inputs:
description: 'Keep Endo repository after installing from it'
required: false
default: 'false'
ignore-endo-branch:
description: 'Ignore external Endo branch configuration'
required: false
default: 'false'
xsnap-random-init:
description: Build xsnap binary with random memory init
required: false
Expand Down Expand Up @@ -46,7 +50,9 @@ runs:
result-encoding: string
script: |-
let branch = 'NOPE';
if (context.eventName === 'schedule') {
if (${{ inputs.ignore-endo-branch }}) {
// Skip endo branch
} else if (context.eventName === 'schedule') {
branch = 'master';
} else if (context.payload.pull_request) {
const { body } = context.payload.pull_request;
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,29 @@ jobs:
- uses: ./.github/actions/restore-node
with:
node-version: '18.x'
# Rebuilding the SDK image with resolved endo packages is not currently supported
# and since we can't build core eval submissions form the SDK using a newer endo,
# simply ignore any endo branch integration (this means we don't have full coverage)
ignore-endo-branch: 'true'
id: restore-node
- name: setup a3p-integration
run: |
corepack enable
yarn install
working-directory: a3p-integration
- name: verify SDK image didn't change
# In the future when we can rebuild the SDK image with resolved endo packages, it would
# be expected that the SDK image previously built has changed
if: steps.restore-node.outputs.endo-branch == 'NOPE'
run: |
original=$(docker inspect --format "{{.ID}}" ghcr.io/agoric/agoric-sdk:unreleased)
yarn build:sdk
new=$(docker inspect --format "{{.ID}}" ghcr.io/agoric/agoric-sdk:unreleased)
if [ "$original" != "$new" ]; then
echo "New SDK docker image ($new) changed after restore-node (original $original)" 1>&2
exit 1
fi
working-directory: a3p-integration
- name: build proposals tests
run: yarn build
working-directory: a3p-integration
Expand Down

0 comments on commit 77bad99

Please sign in to comment.