chore: update ci to new default branch name

storacha · Oct 12, 2022 · 40b5e2f · 40b5e2f
1 parent 4ee789f
commit 40b5e2f
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 215 deletions.
diff --git a/.github/workflows/access-api.yml b/.github/workflows/access-api.yml
@@ -5,7 +5,7 @@ env:
 on:
  push:
  branches:
- - master
+ - main
  paths:
  - 'packages/access-api/**'
  - '.github/workflows/access-api.yml'
@@ -21,11 +21,11 @@ jobs:
  test:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
- - uses: pnpm/action-setup@v2.0.1
+ - uses: actions/checkout@v3
+ - uses: pnpm/action-setup@v2.2.3
  with:
  version: 7
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
  with:
  node-version: 18
  cache: 'pnpm'
@@ -34,7 +34,7 @@ jobs:
  - run: pnpm -r --filter @web3-storage/access-api run test
  deploy-staging:
  needs: test
- if: github.head_ref == 'release-please--branches--master--components--access-api'
+ if: github.head_ref == 'release-please--branches--main--components--access-api'
  uses: './.github/workflows/reuse-deploy-api.yml'
  with:
  environment: staging

diff --git a/.github/workflows/access.yml b/.github/workflows/access.yml
@@ -5,7 +5,7 @@ env:
 on:
  push:
  branches:
- - master
+ - main
  paths:
  - 'packages/access/**'
  - '.github/workflows/access.yml'
@@ -19,11 +19,11 @@ jobs:
  test:
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
- - uses: pnpm/action-setup@v2.0.1
+ - uses: actions/checkout@v3
+ - uses: pnpm/action-setup@v2.2.3
  with:
  version: 7
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
  with:
  node-version: 18
  cache: 'pnpm'

diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -25,11 +25,11 @@ jobs:
  runs-on: ubuntu-latest
  if: github.event.inputs.package == 'wallet'
  steps:
- - uses: actions/checkout@v2
- - uses: pnpm/action-setup@v2.0.1
+ - uses: actions/checkout@v3
+ - uses: pnpm/action-setup@v2.2.3
  with:
  version: 7
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
  with:
  node-version: 16
  cache: 'pnpm'
@@ -41,7 +41,7 @@ jobs:
  ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-
  - run: pnpm install
  - run: pnpm -r --filter wallet run build
- - run: pnpm exec wrangler pages publish --project-name ucan-protocol --branch master ./packages/wallet/out
+ - run: pnpm exec wrangler pages publish --project-name ucan-protocol --branch main ./packages/wallet/out
  env:
  CLOUDFLARE_API_TOKEN: ${{ secrets.CF_TOKEN }}
  CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CF_ACCOUNT_ID }}
@@ -55,11 +55,11 @@ jobs:
  runs-on: ubuntu-latest
  if: github.event.inputs.package == 'access'
  steps:
- - uses: actions/checkout@v2
- - uses: pnpm/action-setup@v2.0.1
+ - uses: actions/checkout@v3
+ - uses: pnpm/action-setup@v2.2.3
  with:
  version: 7
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
  with:
  node-version: 18
  registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,14 +5,14 @@ env:
 on:
  push:
  branches:
- - master
+ - main
 jobs:
  release:
  runs-on: ubuntu-latest
  outputs:
  paths_released: ${{ steps.release.outputs.paths_released }}
  steps:
- - uses: GoogleCloudPlatform/release-please-action@v3
+ - uses: google-github-actions/release-please-action@v3
  id: release
  with:
  token: ${{ secrets.GH_TOKEN }}
@@ -24,11 +24,11 @@ jobs:
  if: contains(fromJson(needs.release.outputs.paths_released), 'packages/access')
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@v2
- - uses: pnpm/action-setup@v2.0.1
+ - uses: actions/checkout@v3
+ - uses: pnpm/action-setup@v2.2.3
  with:
  version: 7
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
  with:
  node-version: 18
  registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/reuse-deploy-api.yml b/.github/workflows/reuse-deploy-api.yml
@@ -26,11 +26,11 @@ jobs:
  runs-on: ubuntu-latest
  environment: ${{ inputs.environment }}
  steps:
- - uses: actions/checkout@v2
- - uses: pnpm/action-setup@v2.0.1
+ - uses: actions/checkout@v3
+ - uses: pnpm/action-setup@v2.2.3
  with:
  version: 7
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
  with:
  node-version: 18
  cache: 'pnpm'

diff --git a/.github/workflows/store.yml b/.github/workflows/store.yml
@@ -0,0 +1,31 @@
+name: Store API
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - main
+ paths:
+ - 'packages/store/**'
+ - '.github/workflows/store.yml'
+ - 'pnpm-lock.yaml'
+ pull_request:
+ paths:
+ - 'packages/store/**'
+ - '.github/workflows/store.yml'
+ - 'pnpm-lock.yaml'
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: pnpm/action-setup@v2.2.3
+ with:
+ version: 7
+ - uses: actions/setup-node@v3
+ with:
+ node-version: 18
+ cache: 'pnpm'
+ - run: pnpm install
+ - run: pnpm -r --filter @web3-storage/store run lint
+ - run: pnpm -r --filter @web3-storage/store run test
diff --git a/.github/workflows/w3-store.yml b/.github/workflows/w3-store.yml
diff --git a/packages/access/package.json b/packages/access/package.json
@@ -2,6 +2,12 @@
  "name": "@web3-storage/access",
  "version": "2.1.1",
  "description": "w3access SDK",
+ "homepage": "https://github.com/web3-storage/w3-protocol/tree/main/packages/access",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/web3-storage/w3-protocol.git",
+ "directory": "packages/access"
+ },
  "author": "Hugo Dias <hugomrdias@gmail.com> (hugodias.me)",
  "license": "(Apache-2.0 OR MIT)",
  "type": "module",

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -1,5 +1,5 @@
 {
- "name": "w3-store",
+ "name": "@web3-storage/store",
  "description": "web3.storage upload service",
  "version": "1.1.0",
  "types": "./dist/src/lib.d.ts",
@@ -13,9 +13,10 @@
  ],
  "repository": {
  "type": "git",
- "url": "https://github.com/web3-storage/ucanto.git"
+ "url": "https://github.com/web3-storage/w3-protocol.git",
+ "directory": "packages/store"
  },
- "homepage": "https://github.com/web3-storage/ucanto/tree/demo/upload-v2",
+ "homepage": "https://github.com/web3-storage/w3-protocol/tree/main/packages/store",
  "scripts": {
  "check": "tsc --build",
  "test": "npm run test:node",

diff --git a/packages/store/src/identity/lib.js b/packages/store/src/identity/lib.js
@@ -55,6 +55,7 @@ export const connect = ({
  id,
  url,
  transport = { encoder: CAR, decoder: CBOR },
+ // @ts-ignore
  fetch = webfetch,
  method,
 }) =>

diff --git a/packages/store/src/signer/lib.js b/packages/store/src/signer/lib.js
@@ -13,6 +13,7 @@ export const sign = (link, { bucket, expires = 1000, ...options }) => {
  accessKeyId: options.accessKeyId,
  secretAccessKey: options.secretAccessKey,
  region: options.region,
+ // @ts-ignore
  sessionToken: options.sessionToken,
  })
 

diff --git a/packages/store/src/type/identity.ts b/packages/store/src/type/identity.ts
@@ -1,10 +1,4 @@
-import type {
- Capability,
- ServiceMethod,
- DID,
- Resource,
- Failure,
-} from '@ucanto/server'
+import type { Capability, ServiceMethod, DID } from '@ucanto/server'
 import type { ServiceError } from './error'
 
 export interface Identity {