-
Notifications
You must be signed in to change notification settings - Fork 266
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add boxes to CI #2456
Merged
Merged
feat: add boxes to CI #2456
Changes from 15 commits
Commits
Show all changes
65 commits
Select commit
Hold shift + click to select a range
09421ab
readd circleci, add a dockerfile
dan-aztec 04747af
whitespace
dan-aztec 683c54e
try a wildcard in build_manifest
dan-aztec 684289e
just try building blank-react
dan-aztec 04dd89f
update the projectDir
dan-aztec e3512b7
[debug ci] blank liens
dan-aztec e13e4cd
fix circleci job name
dan-aztec da694eb
[debug ci]
dan-aztec 656afe3
re-add yarn build
dan-aztec 452d036
copy for circuits.js, add dep
dan-aztec 788f94d
move from
dan-aztec c81e1a3
yarn first
dan-aztec 929a541
revert bad
dan-aztec 9b3e1e2
tsc -b first
dan-aztec 2499ff5
formatting
dan-aztec 7920a3a
add aztec/types
dan-aztec 9c88e82
revert wasm direct copy
dan-aztec 9dd1052
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec ffc25bc
add yarn test to the dockerfile
dan-aztec bc4eda7
just build, no test
dan-aztec ab3352a
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec a114d09
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec d02457b
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec 26cf2be
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec 0876733
try to copy e2e to run tests on sandbox
dan-aztec 851cadc
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec 998af17
revert bad merge
dan-aztec 14471be
one more revert
dan-aztec 183cfe8
add script
dan-aztec 60e059b
use run_script
dan-aztec 3bc69a0
try -
dan-aztec b3db1e4
use updated ecr command
dan-aztec 5dc0aee
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec 3169d85
somehow file was uncomitted
dan-aztec 38a4cea
fix the envvar
dan-aztec ae2fe2e
ugh
dan-aztec 01525cf
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec d130c52
adam fixes everything
dan-aztec edc5479
bad copy
dan-aztec 47aa06e
just use entrypoint
dan-aztec 3854364
dont prune dev deps
dan-aztec 81d9e63
Merge remote-tracking branch 'origin/master' into dan/2455-add-boxes-…
dan-aztec 397f9e7
merge
dan-aztec 11cba28
Revert "merge"
dan-aztec eed1c75
re-add job
dan-aztec 67b9c1c
bad line
dan-aztec 14be304
depend on yarn megajob
dan-aztec 33775f9
use updated image
dan-aztec 38ee7f5
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec c2f78d8
try to use universal image
dan-aztec a39b447
depend on aztec-sandbox job so image is ready
dan-aztec f41746a
fix docker compose
dan-aztec f92e6a1
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec 070ccb9
add docker-pose files and update package.json
dan-aztec 3b62679
also run noirup
dan-aztec 914e94f
update test command
dan-aztec b3a3910
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec b51b813
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec cdfeb81
add other boxes to jobz
dan-aztec c478808
conditional usage of dom to allow node test to import
dan-aztec 94cfced
Merge branch 'master' into dan/2455-add-boxes-to-ci
dan-aztec cd3bc40
small readme fix
dan-aztec 74682b9
switch to local link for contractABI
dan-aztec f54af0c
revert noir-contracts
dan-aztec bf4e75a
revert more noir-contracts
dan-aztec File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/circuits.js AS circuits | ||
FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder | ||
|
||
COPY . . | ||
|
||
COPY --from=circuits /usr/src/yarn-project/circuits.js/dest /usr/src/yarn-project/circuits.js/dest | ||
|
||
WORKDIR /usr/src/yarn-project/boxes/blank-react | ||
RUN yarn | ||
RUN yarn build && yarn formatting | ||
|
||
RUN yarn cache clean | ||
RUN yarn workspaces focus --production > /dev/null | ||
|
||
FROM node:18-alpine | ||
COPY --from=builder /usr/src/yarn-project/boxes/blank-react /usr/src/yarn-project/boxes/blank-react | ||
WORKDIR /usr/src/yarn-project/boxes/blank-react | ||
ENTRYPOINT ["yarn"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 49 additions & 50 deletions
99
yarn-project/boxes/blank-react/src/app/components/contract_function_form.module.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,67 +1,66 @@ | ||
.input { | ||
border: none; | ||
outline-width: 0; | ||
outline-color: rgba(0, 0, 0, 0); | ||
padding: 2px 20px 0 20px; | ||
width: 100%; | ||
height: 45px; | ||
color: #000; | ||
border: 1px solid rgba(0, 0, 0, 0); | ||
font-size: 16px; | ||
text-align: left; | ||
font-weight: 400; | ||
border-radius: 10px; | ||
text-align: left; | ||
text-overflow: ellipsis; | ||
transition: box-shadow .2s; | ||
box-shadow: 0px 4px 10px rgba(0, 0, 0, .1); | ||
background-color: white; | ||
-webkit-appearance: none; | ||
border: none; | ||
outline-width: 0; | ||
outline-color: rgba(0, 0, 0, 0); | ||
padding: 2px 20px 0 20px; | ||
width: 100%; | ||
height: 45px; | ||
color: #000; | ||
border: 1px solid rgba(0, 0, 0, 0); | ||
font-size: 16px; | ||
text-align: left; | ||
font-weight: 400; | ||
border-radius: 10px; | ||
text-align: left; | ||
text-overflow: ellipsis; | ||
transition: box-shadow 0.2s; | ||
box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1); | ||
background-color: white; | ||
-webkit-appearance: none; | ||
|
||
|
||
&:disabled { | ||
color: #4a4a4a; | ||
background-color: rgba(239, 239, 239, 0.3); | ||
background: radial-gradient(rgba(239, 239, 239, 0.3), rgba(239, 239, 239, 0.3)); | ||
-webkit-text-fill-color: #4a4a4a; | ||
cursor: not-allowed; | ||
} | ||
&:disabled { | ||
color: #4a4a4a; | ||
background-color: rgba(239, 239, 239, 0.3); | ||
background: radial-gradient(rgba(239, 239, 239, 0.3), rgba(239, 239, 239, 0.3)); | ||
-webkit-text-fill-color: #4a4a4a; | ||
cursor: not-allowed; | ||
} | ||
} | ||
|
||
.label { | ||
font-weight: 450; | ||
font-size: 18px; | ||
display: flex; | ||
width: 100%; | ||
flex-direction: column; | ||
text-align: left; | ||
margin-bottom: 15px; | ||
justify-content: space-between; | ||
font-weight: 450; | ||
font-size: 18px; | ||
display: flex; | ||
width: 100%; | ||
flex-direction: column; | ||
text-align: left; | ||
margin-bottom: 15px; | ||
justify-content: space-between; | ||
} | ||
|
||
.inputWrapper { | ||
width: 100%; | ||
display: flex; | ||
gap: 15px; | ||
width: 100%; | ||
display: flex; | ||
gap: 15px; | ||
} | ||
|
||
.field { | ||
display: flex; | ||
justify-content: start; | ||
flex-direction: column; | ||
align-items: flex-start; | ||
display: flex; | ||
justify-content: start; | ||
flex-direction: column; | ||
align-items: flex-start; | ||
} | ||
|
||
.content { | ||
display: flex; | ||
justify-content: space-between; | ||
flex-direction: column; | ||
margin: 30px; | ||
width: 450px; | ||
gap: 30px; | ||
display: flex; | ||
justify-content: space-between; | ||
flex-direction: column; | ||
margin: 30px; | ||
width: 450px; | ||
gap: 30px; | ||
} | ||
|
||
.actionButton { | ||
width: 100%; | ||
align-self: center; | ||
} | ||
width: 100%; | ||
align-self: center; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
yarn-project/boxes/blank-react/src/app/components/copy.module.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
.copy { | ||
cursor: pointer; | ||
width: 35px; | ||
height: 25px; | ||
padding: 2px 8px; | ||
} | ||
cursor: pointer; | ||
width: 35px; | ||
height: 25px; | ||
padding: 2px 8px; | ||
} |
74 changes: 37 additions & 37 deletions
74
yarn-project/boxes/blank-react/src/app/components/dropdown.module.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,68 +1,68 @@ | ||
.dropdownWrapper { | ||
position: absolute; | ||
top: 60px; | ||
right: 0px; | ||
border-radius: 10px; | ||
display: flex; | ||
overflow: hidden; | ||
flex-direction: column; | ||
gap: 1px; | ||
border: 1px solid #ebeaea; | ||
background-color: #ebeaea; | ||
z-index: 1; | ||
position: absolute; | ||
top: 60px; | ||
right: 0px; | ||
border-radius: 10px; | ||
display: flex; | ||
overflow: hidden; | ||
flex-direction: column; | ||
gap: 1px; | ||
border: 1px solid #ebeaea; | ||
background-color: #ebeaea; | ||
z-index: 1; | ||
} | ||
|
||
.dropdownOptionBackground { | ||
background-color: white; | ||
background-color: white; | ||
} | ||
|
||
.dropdownOption { | ||
font-size: 14px; | ||
padding: 10px 25px; | ||
white-space: nowrap; | ||
cursor: pointer; | ||
font-weight: 600; | ||
justify-content: space-between; | ||
letter-spacing: 0.5px; | ||
display: flex; | ||
font-size: 14px; | ||
padding: 10px 25px; | ||
white-space: nowrap; | ||
cursor: pointer; | ||
font-weight: 600; | ||
justify-content: space-between; | ||
letter-spacing: 0.5px; | ||
display: flex; | ||
} | ||
|
||
.singleOption { | ||
text-align: center; | ||
align-items: center; | ||
justify-content: center; | ||
text-align: center; | ||
align-items: center; | ||
justify-content: center; | ||
} | ||
|
||
.dropdownOption.disabled { | ||
background-image: initial; | ||
cursor: default; | ||
background-color: #c4c4c4; | ||
background-image: initial; | ||
cursor: default; | ||
background-color: #c4c4c4; | ||
} | ||
|
||
.dropdownOptionBackground:hover { | ||
background-color: #ebeaea; | ||
background-color: #ebeaea; | ||
} | ||
|
||
.dropdownOptionBackground.disabled:hover { | ||
background-color: white; | ||
background-color: white; | ||
} | ||
|
||
.sublabel { | ||
text-align: right; | ||
text-align: right; | ||
} | ||
|
||
.sublabels { | ||
display: flex; | ||
flex-direction: row; | ||
font-weight: 450; | ||
display: flex; | ||
flex-direction: row; | ||
font-weight: 450; | ||
} | ||
|
||
.feeOption { | ||
gap: 5px; | ||
display: flex; | ||
flex-direction: column; | ||
gap: 5px; | ||
display: flex; | ||
flex-direction: column; | ||
} | ||
|
||
.label { | ||
color: #2f1f49; | ||
} | ||
color: #2f1f49; | ||
} |
40 changes: 20 additions & 20 deletions
40
yarn-project/boxes/blank-react/src/app/components/popup.module.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,27 @@ | ||
.popup { | ||
width: 66vw; | ||
position: absolute; | ||
display: flex; | ||
flex-direction: column; | ||
justify-content: center; | ||
align-items: center; | ||
background-color: white; | ||
border-radius: 20px; | ||
justify-content: space-around; | ||
box-shadow: 0px 4px 10px rgba(0, 0, 0, .1); | ||
border: 3px solid rgb(47, 31, 73); | ||
align-items: center; | ||
gap: 30px; | ||
padding: 30px; | ||
overflow: scroll; | ||
min-width: 600px; | ||
z-index: 100; | ||
width: 66vw; | ||
position: absolute; | ||
display: flex; | ||
flex-direction: column; | ||
justify-content: center; | ||
align-items: center; | ||
background-color: white; | ||
border-radius: 20px; | ||
justify-content: space-around; | ||
box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1); | ||
border: 3px solid rgb(47, 31, 73); | ||
align-items: center; | ||
gap: 30px; | ||
padding: 30px; | ||
overflow: scroll; | ||
min-width: 600px; | ||
z-index: 100; | ||
} | ||
|
||
.alert { | ||
width: 20px; | ||
width: 20px; | ||
} | ||
|
||
.content { | ||
width: 100%; | ||
} | ||
width: 100%; | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note there's two
FROM
, normally it would just be builder, but this one requires the circuits.js subpackage for a wasm file for the webpack build