Skip to content

Commit

Permalink
Merge pull request #166 from algorandfoundation/develop
Browse files Browse the repository at this point in the history
deploy: staging to production
  • Loading branch information
PhearZero authored Jun 25, 2024
2 parents a1f83f2 + b88deb0 commit c5bdd82
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/node-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
audit-script:
required: false
type: string
default: npm audit --audit-level=high
default: npm audit --audit-level=critical
build-script:
required: false
type: string
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:
with:
working-directory: ./src/dapp
run-build: true
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
build-xgov-dapp:
name: xGov Dapp
uses: ./.github/workflows/node-ci.yml
with:
working-directory: ./src/xgov-dapp
pre-run-script: cd ../dapp && npm ci
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
run-dispatch: true
secrets:
chromatic-token: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
Expand All @@ -37,7 +37,7 @@ jobs:
uses: ./.github/workflows/node-ci.yml
with:
working-directory: ./src/build-a-bull
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
secrets:
npm-auth-token: ${{ secrets.GITHUB_TOKEN }}
build-api:
Expand All @@ -47,7 +47,7 @@ jobs:
node-version: 18.x
working-directory: ./src/voting-metadata-api
run-build: true
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
build-algorand:
name: Algorand build
uses: ./.github/workflows/smart-contract-ci.yml
Expand All @@ -59,4 +59,4 @@ jobs:
with:
working-directory: ./infrastructure
run-build: true
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,35 +22,35 @@ jobs:
with:
working-directory: ./src/dapp
compile-script: npm run typecheck
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
ci-xgov-dapp:
name: CI xGov Dapp
uses: ./.github/workflows/node-ci.yml
with:
working-directory: ./src/xgov-dapp
pre-run-script: cd ../dapp && npm ci
compile-script: npm run typecheck
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
ci-events-dapp:
name: CI Events Dapp
uses: ./.github/workflows/node-ci.yml
with:
working-directory: ./src/build-a-bull
compile-script: npm run typecheck
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
ci-api:
name: CI API
uses: ./.github/workflows/node-ci.yml
with:
working-directory: ./src/voting-metadata-api
compile-script: npm run typecheck
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
ci-infrastructure:
name: CI Infrastructure
uses: ./.github/workflows/node-ci.yml
with:
working-directory: ./infrastructure
audit-script: npm run audit --audit-level=high
audit-script: npm run audit --audit-level=critical
ci-algorand:
name: Algorand build
uses: ./.github/workflows/smart-contract-ci.yml
Expand Down
4 changes: 1 addition & 3 deletions src/xgov-dapp/src/components/siteFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ function NavLink(props: { link: Link }) {
}

const links: Link[] = [
{ name: 'Algorand Community', href: 'https://community.algorand.org/' },
{ name: 'Algorand Community', href: 'https://forum.algorand.org/' },
{ name: 'Developer Resources', href: 'https://developer.algorand.org/' },
{ name: 'FAQs', href: 'https://algorand.foundation/faq' },
{
name: 'Disclaimers',
href: 'https://algorand.foundation/terms-and-conditions-and-important-disclaimers-of-algo-token-incentives',
Expand All @@ -25,7 +24,6 @@ const links: Link[] = [
name: 'Privacy Policies',
href: 'https://algorandfoundationv2.cdn.prismic.io/algorandfoundationv2/120c23ac-cc63-4c42-a10e-a53169fa4134_AF_Privacy_Policy.pdf',
},
{ name: 'Contact Us', href: 'https://algorand.foundation/contact' },
{ name: 'Algorand Inc.', href: 'https://www.algorand.com/' },
]
export default function SiteFooter() {
Expand Down
2 changes: 1 addition & 1 deletion src/xgov-dapp/src/features/rounds/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const VotingRoundsPage = () => {
<div className="container">
<div className="flex flex-col items-end">
<Box className="bg-white flex rounded-xl px-4 py-2 items-center">
<MuiLink className="no-underline hover:underline" href="https://www.algorand.foundation/xgov-guide" target="_blank">
<MuiLink className="no-underline hover:underline" href="https://forum.algorand.org/t/xgov-guide-post-alpha-pilot/12153" target="_blank">

Check warning on line 72 in src/xgov-dapp/src/features/rounds/index.tsx

View workflow job for this annotation

GitHub Actions / CI xGov Dapp / node-ci

Replace `·className="no-underline·hover:underline"·href="https://forum.algorand.org/t/xgov-guide-post-alpha-pilot/12153"·target="_blank"` with `⏎············className="no-underline·hover:underline"⏎············href="https://forum.algorand.org/t/xgov-guide-post-alpha-pilot/12153"⏎············target="_blank"⏎··········`
xGov Guide
<LaunchIcon className="ml-2 text-grey-light align-bottom" />
</MuiLink>
Expand Down
8 changes: 1 addition & 7 deletions src/xgov-dapp/src/features/status/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,7 @@ function Status() {
</div>
<div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
<Box className="bg-white flex rounded-xl px-4 py-2 items-center">
<MuiLink className="no-underline hover:underline" href="https://algorand.foundation/xgov" target="_blank">
xGov Program Info
<LaunchIcon className="ml-2 text-grey-light align-bottom" />
</MuiLink>
</Box>
<Box className="bg-white flex rounded-xl px-4 py-2 items-center">
<MuiLink className="no-underline hover:underline" href="https://www.algorand.foundation/xgov-guide" target="_blank">
<MuiLink className="no-underline hover:underline" href="https://forum.algorand.org/t/xgov-guide-post-alpha-pilot/12153" target="_blank">

Check warning on line 148 in src/xgov-dapp/src/features/status/index.tsx

View workflow job for this annotation

GitHub Actions / CI xGov Dapp / node-ci

Replace `·className="no-underline·hover:underline"·href="https://forum.algorand.org/t/xgov-guide-post-alpha-pilot/12153"·target="_blank"` with `⏎··············className="no-underline·hover:underline"⏎··············href="https://forum.algorand.org/t/xgov-guide-post-alpha-pilot/12153"⏎··············target="_blank"⏎············`
xGov Guide
<LaunchIcon className="ml-2 text-grey-light align-bottom" />
</MuiLink>
Expand Down

0 comments on commit c5bdd82

Please sign in to comment.