From c5a1fc9c924a4a9f97a71c5ec57d54a9c0e448bb Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Mon, 4 Nov 2024 01:06:25 -0600 Subject: [PATCH 01/13] change button to create instead of submit --- .../src/modules/dao/components/Activity/Activity.tsx | 10 +++++----- apps/web/src/styles/Proposals.css.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/web/src/modules/dao/components/Activity/Activity.tsx b/apps/web/src/modules/dao/components/Activity/Activity.tsx index e399bb569..c6e241c1c 100644 --- a/apps/web/src/modules/dao/components/Activity/Activity.tsx +++ b/apps/web/src/modules/dao/components/Activity/Activity.tsx @@ -25,7 +25,7 @@ import { useChainStore } from 'src/stores/useChainStore' import { delegateBtn, selectDelegateBtn, - submitProposalBtn, + createProposalBtn, } from 'src/styles/Proposals.css' import { sectionWrapperStyle } from 'src/styles/dao.css' import { AddressType } from 'src/typings' @@ -148,20 +148,20 @@ export const Activity: React.FC = () => { ) : null} {!address ? ( ) : ( )} diff --git a/apps/web/src/styles/Proposals.css.ts b/apps/web/src/styles/Proposals.css.ts index 965abf2ad..cc17f576f 100644 --- a/apps/web/src/styles/Proposals.css.ts +++ b/apps/web/src/styles/Proposals.css.ts @@ -39,7 +39,7 @@ export const delegateBtn = style({ }, }) -export const submitProposalBtn = style({ +export const createProposalBtn = style({ fontSize: '1rem', fontFamily: 'ptRoot!important', borderRadius: '12px', From 98f4ff7c0663da35ac0e120fd86272781d5987b1 Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:56:26 -0600 Subject: [PATCH 02/13] Testing PR deployment preview workflow --- .github/workflows/deploy_preview.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/deploy_preview.yml diff --git a/.github/workflows/deploy_preview.yml b/.github/workflows/deploy_preview.yml new file mode 100644 index 000000000..e4edfbd41 --- /dev/null +++ b/.github/workflows/deploy_preview.yml @@ -0,0 +1,25 @@ +name: Deploy Preview to Vercel + +on: + pull_request: + types: [opened, synchronize, reopened] + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Install Vercel CLI + run: npm install --global vercel@latest + + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }} + + - name: Build Project + run: vercel build --token=${{ secrets.VERCEL_TOKEN }} + + - name: Deploy to Vercel + run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} \ No newline at end of file From f20dcedaa83d824880be27fa349ea9cd0d408549 Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Tue, 5 Nov 2024 14:46:40 -0600 Subject: [PATCH 03/13] Take 2: Testing PR deployment preview workflow --- .../{deploy_preview.yml => preview.yaml} | 21 ++++++++--------- .../workflows/{main.yml => production.yaml} | 23 +++++++++++++++++++ 2 files changed, 32 insertions(+), 12 deletions(-) rename .github/workflows/{deploy_preview.yml => preview.yaml} (55%) rename .github/workflows/{main.yml => production.yaml} (71%) diff --git a/.github/workflows/deploy_preview.yml b/.github/workflows/preview.yaml similarity index 55% rename from .github/workflows/deploy_preview.yml rename to .github/workflows/preview.yaml index e4edfbd41..a002a9d18 100644 --- a/.github/workflows/deploy_preview.yml +++ b/.github/workflows/preview.yaml @@ -1,25 +1,22 @@ -name: Deploy Preview to Vercel +name: GitHub Actions Vercel Preview Deployment +env: + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: pull_request: types: [opened, synchronize, reopened] jobs: - deploy: + Deploy-Preview: runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - + - uses: actions/checkout@v3 - name: Install Vercel CLI - run: npm install --global vercel@latest - + run: npm install --global vercel@canary - name: Pull Vercel Environment Information run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }} - - - name: Build Project + - name: Build Project Artifacts run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - - - name: Deploy to Vercel + - name: Deploy Project Artifacts to Vercel run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/production.yaml similarity index 71% rename from .github/workflows/main.yml rename to .github/workflows/production.yaml index bef426427..2d9bb5121 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/production.yaml @@ -79,3 +79,26 @@ jobs: # Need to shutdown Anvil so cache gets created - name: 💤 Shutdown Anvil run: pkill -2 anvil + +# TODO @0xMillz for production: (https://vercel.com/guides/how-can-i-use-github-actions-with-vercel) +#name: Vercel Production Deployment +#env: +# VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} +# VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} +#on: +# push: +# branches: +# - main +#jobs: +# Deploy-Production: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# - name: Install Vercel CLI +# run: npm install --global vercel@latest +# - name: Pull Vercel Environment Information +# run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} +# - name: Build Project Artifacts +# run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} +# - name: Deploy Project Artifacts to Vercel +# run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} From 5ca1c5cf3f68734f4c71cc0fabe45914f6bf2b07 Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Tue, 5 Nov 2024 14:49:58 -0600 Subject: [PATCH 04/13] Take 3: Comment out legacy workflowe that is interfering --- .github/workflows/production.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/production.yaml b/.github/workflows/production.yaml index 2d9bb5121..a544e01d5 100644 --- a/.github/workflows/production.yaml +++ b/.github/workflows/production.yaml @@ -2,8 +2,8 @@ name: CI on: - pull_request: - types: [opened, reopened, synchronize, ready_for_review] +# pull_request: +# types: [opened, reopened, synchronize, ready_for_review] push: branches: [main] From c059145261ec3e5efb0eb26a308bafc6a0ed18ef Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 10:36:31 -0600 Subject: [PATCH 05/13] Update prod workflow --- .github/workflows/production.yaml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/.github/workflows/production.yaml b/.github/workflows/production.yaml index a544e01d5..6802121b3 100644 --- a/.github/workflows/production.yaml +++ b/.github/workflows/production.yaml @@ -1,12 +1,12 @@ # This workflow runs the CI command defined in package.json name: CI - +env: + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: -# pull_request: -# types: [opened, reopened, synchronize, ready_for_review] push: - branches: [main] - + branches: + - main jobs: ci: name: CI @@ -81,18 +81,7 @@ jobs: run: pkill -2 anvil # TODO @0xMillz for production: (https://vercel.com/guides/how-can-i-use-github-actions-with-vercel) -#name: Vercel Production Deployment -#env: -# VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} -# VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} -#on: -# push: -# branches: -# - main -#jobs: -# Deploy-Production: -# runs-on: ubuntu-latest -# steps: + # - uses: actions/checkout@v2 # - name: Install Vercel CLI # run: npm install --global vercel@latest From 96f6a2462d8d08c1a38f3ed23493e3ff82571c67 Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 11:23:52 -0600 Subject: [PATCH 06/13] Add VERCEL_TOKEN --- .github/workflows/preview.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index a002a9d18..ac0c15e4d 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -2,6 +2,7 @@ name: GitHub Actions Vercel Preview Deployment env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} + VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }} on: pull_request: From 7e36675808b53d9dd5ef61d6f6ba29caedc3309f Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 11:39:37 -0600 Subject: [PATCH 07/13] Add pnpm step to workflow --- .github/workflows/preview.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index ac0c15e4d..3b72f07dd 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -13,6 +13,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Install pnpm + run: npm install -g pnpm - name: Install Vercel CLI run: npm install --global vercel@canary - name: Pull Vercel Environment Information From 84636b69037164e803df8a65e6f857a91ccfe9bf Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 11:45:36 -0600 Subject: [PATCH 08/13] Add pnpm caching step to workflow --- .github/workflows/preview.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 3b72f07dd..32e2ab727 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -13,6 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: Cache pnpm + uses: actions/cache@v3 + with: + path: ~/.pnpm-store + key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm- - name: Install pnpm run: npm install -g pnpm - name: Install Vercel CLI From 6a6e29a122b2e30b5c405d6988fa1497479ca503 Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 11:57:04 -0600 Subject: [PATCH 09/13] Optimize preview workflow for efficiency and speed --- .github/workflows/preview.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 32e2ab727..7a43d77e0 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -13,20 +13,19 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Cache pnpm + - name: Ensure pnpm store directory exists + run: mkdir -p ~/.pnpm-store + - name: Cache Node Modules and pnpm Store uses: actions/cache@v3 with: - path: ~/.pnpm-store + path: | + ~/.pnpm-store + node_modules key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-pnpm- - - name: Install pnpm - run: npm install -g pnpm - - name: Install Vercel CLI - run: npm install --global vercel@canary - - name: Pull Vercel Environment Information - run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }} - - name: Build Project Artifacts - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} + - name: Install pnpm and Vercel CLI + run: | + npm install -g pnpm vercel@canary - name: Deploy Project Artifacts to Vercel run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} \ No newline at end of file From 5a7967756e3b8524af4e2d3b600bbd4c65a74d25 Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:08:29 -0600 Subject: [PATCH 10/13] Add build step to workflow --- .github/workflows/preview.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 7a43d77e0..59d9f181d 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -27,5 +27,7 @@ jobs: - name: Install pnpm and Vercel CLI run: | npm install -g pnpm vercel@canary + - name: Build Project Artifacts + run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - name: Deploy Project Artifacts to Vercel run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} \ No newline at end of file From ab24b4a602f8e849d96122a8aefd93deb6ddd88e Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:11:40 -0600 Subject: [PATCH 11/13] Get token before build --- .github/workflows/preview.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 59d9f181d..154f2e16a 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -8,6 +8,7 @@ on: pull_request: types: [opened, synchronize, reopened] +jobs: jobs: Deploy-Preview: runs-on: ubuntu-latest @@ -27,6 +28,8 @@ jobs: - name: Install pnpm and Vercel CLI run: | npm install -g pnpm vercel@canary + - name: Pull Vercel Environment Information + run: vercel pull --yes --token=${{ secrets.VERCEL_TOKEN }} - name: Build Project Artifacts run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - name: Deploy Project Artifacts to Vercel From 676bbe269765ab14e79be95e1893456857494100 Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:23:56 -0600 Subject: [PATCH 12/13] lnaguage: change words Submit to Create --- apps/web/src/modules/dashboard/DaoProposals.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/modules/dashboard/DaoProposals.tsx b/apps/web/src/modules/dashboard/DaoProposals.tsx index 77da70a3f..114952391 100644 --- a/apps/web/src/modules/dashboard/DaoProposals.tsx +++ b/apps/web/src/modules/dashboard/DaoProposals.tsx @@ -74,7 +74,7 @@ export const DaoProposals = ({ router.push(`/dao/${currentChainSlug}/${tokenAddress}/proposal/create`) } > - Submit Proposal + Create Proposal From 2a6651a053e710dba24ec62e6d4e23cab516f330 Mon Sep 17 00:00:00 2001 From: 0xMillz <37815163+0xMillz@users.noreply.github.com> Date: Thu, 7 Nov 2024 12:35:24 -0600 Subject: [PATCH 13/13] fix typo --- .github/workflows/preview.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 154f2e16a..b00a4c6eb 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -8,7 +8,6 @@ on: pull_request: types: [opened, synchronize, reopened] -jobs: jobs: Deploy-Preview: runs-on: ubuntu-latest