Skip to content
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

chore: move deployables into deployables subdirectory #475

Merged
merged 4 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"Delegatecall",
"delegatecalls",
"depay",
"deployables",
"esbuild",
"ethersproject",
"extralight",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/app-preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

defaults:
run:
working-directory: ./app
working-directory: ./deployables/app

jobs:
deploy:
Expand All @@ -24,7 +24,7 @@ jobs:
- name: Deploy
uses: cloudflare/[email protected]
with:
workingDirectory: app
workingDirectory: deployables/app
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
command: versions upload
6 changes: 3 additions & 3 deletions .github/workflows/fork-api-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Deploy Fork API
on:
push:
branches: main
paths: ['fork-api/**', '**/fork-api-release.yaml']
paths: ['deployables/fork-api/**', '**/fork-api-release.yaml']

defaults:
run:
working-directory: ./fork-api
working-directory: ./deployables/fork-api

jobs:
deploy:
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Publish
uses: cloudflare/[email protected]
with:
workingDirectory: fork-api
workingDirectory: deployables/fork-api
apiToken: ${{ secrets.CF_API_TOKEN }}
secrets: |
TENDERLY_ACCESS_KEY
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/live-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
if: github.event.deployment_status.state == 'success'
defaults:
run:
working-directory: ./extension
working-directory: ./deployables/extension
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
Expand Down
45 changes: 5 additions & 40 deletions .github/workflows/prod-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
name: Build Extension
defaults:
run:
working-directory: ./extension
working-directory: ./deployables/extension
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: latest
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
cache: 'pnpm'
cache-dependency-path: '**/pnpm-lock.yaml'

- name: Install deps and build
run: |
Expand All @@ -36,12 +36,12 @@ jobs:
- name: Add zip to Github release
uses: softprops/action-gh-release@v2
with:
files: ./extension/zodiac-pilot.zip
files: ./deployables/extension/zodiac-pilot.zip

- name: Upload & release to Chrome Webstore
uses: mnao305/[email protected]
with:
file-path: ./extension/zodiac-pilot.zip
file-path: ./deployables/extension/zodiac-pilot.zip
extension-id: jklckajipokenkbbodifahogmidkekcb
client-id: ${{ secrets.CHROME_WEBSTORE_CLIENT_ID }}
client-secret: ${{ secrets.CHROME_WEBSTORE_CLIENT_SECRET }}
Expand All @@ -50,38 +50,3 @@ jobs:

- run: mkdir ./release
- run: mv ./zodiac-pilot.zip ./release/zodiac-pilot.zip

# - name: Pin to IPFS
# id: upload
# uses: anantaramdas/ipfs-pinata-deploy-action@39bbda1ce1fe24c69c6f57861b8038278d53688d
# with:
# pin-name: Zodiac Pilot Chrome Extension ${{ github.event.release.tag_name }}
# path: "./extension/release"
# pinata-api-key: ${{ secrets.PINATA_API_KEY }}
# pinata-secret-api-key: ${{ secrets.PINATA_API_SECRET_KEY }}

# - name: Convert CIDv0 to CIDv1
# id: convert_cidv0
# uses: uniswap/[email protected]
# with:
# cidv0: ${{ steps.upload.outputs.hash }}

# - name: Add IPFS links to Github release notes
# id: update_release
# uses: tubone24/[email protected]
# env:
# GITHUB_TOKEN: ${{ github.token }}
# with:
# is_append_body: true
# body: |
# <br />
# This extension will be available in the Chrome Extension store, or you can download it from IPFS, extract it and run it as an unpacked extension.

# IPFS hash of the extension zip file:
# - CIDv0: `${{ steps.upload.outputs.hash }}`
# - CIDv1: `${{ steps.convert_cidv0.outputs.cidv1 }}`

# IPFS gateways:
# - https://gnosis.mypinata.cloud/ipfs/${{ steps.upload.outputs.hash }}
# - https://${{ steps.convert_cidv0.outputs.cidv1 }}.ipfs.dweb.link/
# - https://${{ steps.convert_cidv0.outputs.cidv1 }}.ipfs.cf-ipfs.com/
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./extension
working-directory: ./deployables/extension
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
Expand All @@ -28,4 +28,4 @@ jobs:
if: always()
uses: davelosert/vitest-coverage-report-action@v2
with:
working-directory: extension
working-directory: deployables/extension
6 changes: 3 additions & 3 deletions .github/workflows/vnet-api-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Deploy Vnet API
on:
push:
branches: main
paths: ['vnet-api/**', '**/vnet-api-release.yaml']
paths: ['deployables/vnet-api/**', '**/vnet-api-release.yaml']

defaults:
run:
working-directory: ./vnet-api
working-directory: ./deployables/vnet-api

jobs:
deploy:
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Publish
uses: cloudflare/[email protected]
with:
workingDirectory: vnet-api
workingDirectory: deployables/vnet-api
apiToken: ${{ secrets.CF_API_TOKEN }}
secrets: |
TENDERLY_ACCESS_KEY
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
playwright-report
package.json
.react-router

*.db
*.zip
Expand Down
13 changes: 12 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"search.exclude": {
"node_modules": true,
"public/build": true
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"editor.formatOnSave": true,
"cSpell.userWords": [], // only use words from .cspell.json
"cSpell.enabled": true
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Chrome extension to simulate Dapp interactions and record transactions. [Availab

### Overview

The [extension](./extension/) folder hosts the code of the browser extension.
The included [README](./extension/README.md) documents the most important concepts.
The [extension](./deployables/extension/) folder hosts the code of the browser extension.
The included [README](./deployables/extension/README.md) documents the most important concepts.

To run a development version of the extension from a branch:

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
Loading