Skip to content

Commit

Permalink
chore: update repo (#179)
Browse files Browse the repository at this point in the history
Wow we didn't update this repo since Node.js 16.

This PR updates the gihub actions, node, pnpm, wrangler and release
please versions.

It also:

* Fixes a bug uncovered by using Node.js 20 - we abort the response of
the winning gateway. For some reason on Node.js 16 this doesn't cause
`response.text()` to throw but does on Node.js 20.
* Fixes an issue in the tests - smoke was returning 200 status when it
should have been returning 500, and the test was incorrectly expecting
the wrong number of failures (so it was smothered).
* Fixes repo URLs in READMEs.
* Adds `standard` to the root `package.json` since `lint-staged` (run in
the root) uses it and couldn't find it.
* Updates the Cloudflare deployment token name.
  • Loading branch information
Alan Shaw authored Sep 20, 2024
1 parent ae464e5 commit 1d99326
Show file tree
Hide file tree
Showing 20 changed files with 5,572 additions and 4,142 deletions.
44 changes: 22 additions & 22 deletions .github/workflows/cid-verifier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
runs-on: ubuntu-latest
name: Lint
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
- uses: actions/setup-node@v3
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- run: pnpm build:cid-verifier
Expand All @@ -33,13 +33,13 @@ jobs:
runs-on: ubuntu-latest
name: Test
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
- uses: actions/setup-node@v3
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- run: pnpm test:cid-verifier
Expand All @@ -49,17 +49,17 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
- uses: actions/setup-node@v3
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- name: Publish app
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3
env:
ENV: 'staging' # inform the build process what the env is
SENTRY_TOKEN: ${{secrets.SENTRY_TOKEN}}
Expand Down Expand Up @@ -92,17 +92,17 @@ jobs:
- test
- changelog
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
- uses: actions/setup-node@v3
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- name: Deploy
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3
env:
ENV: 'production' # inform the build process what the env is
SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/cron-denylist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
env: ['staging', 'production']
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
- uses: actions/setup-node@v2
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- name: Run job
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/denylist-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
env: ['staging', 'production']
timeout-minutes: 20
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
- uses: actions/setup-node@v2
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- name: Run job
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/denylist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: ubuntu-latest
name: Lint
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
- uses: actions/setup-node@v2
version: 9
- uses: actions/setup-node@v4
- run: pnpm install
- run: pnpm build:denylist
- name: Lint
Expand All @@ -30,11 +30,11 @@ jobs:
runs-on: ubuntu-latest
name: Test
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
- uses: actions/setup-node@v2
version: 9
- uses: actions/setup-node@v4
- run: pnpm install
- run: pnpm test:denylist
deploy-staging:
Expand All @@ -43,16 +43,16 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
- uses: actions/setup-node@v2
version: 9
- uses: actions/setup-node@v4
with:
cache: 'pnpm'
- run: pnpm install
- name: Publish app
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3
env:
ENV: 'staging' # inform the build process what the env is
SENTRY_TOKEN: ${{secrets.SENTRY_TOKEN}}
Expand All @@ -68,7 +68,7 @@ jobs:
outputs:
releases_created: ${{ steps.tag-release.outputs.releases_created }}
steps:
- uses: GoogleCloudPlatform/release-please-action@v3
- uses: googleapis/release-please-action@v4
id: tag-release
with:
path: packages/denylist
Expand All @@ -85,18 +85,18 @@ jobs:
- test
- changelog
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
- uses: actions/setup-node@v2
version: 9
- uses: actions/setup-node@v4
with:
cache: 'pnpm'
node-version: 18
node-version: 20
registry-url: 'https://registry.npmjs.org'
- run: pnpm install
- name: Deploy
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3
env:
ENV: 'production' # inform the build process what the env is
SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/edge-gateway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
runs-on: ubuntu-latest
name: Lint
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
- uses: actions/setup-node@v3
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- run: pnpm build:edge-gateway
Expand All @@ -33,13 +33,13 @@ jobs:
runs-on: ubuntu-latest
name: Test
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
version: 9
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- run: pnpm test:edge-gateway
Expand All @@ -49,17 +49,17 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
- uses: actions/setup-node@v3
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- name: Publish app
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3
env:
ENV: 'staging' # inform the build process what the env is
SENTRY_TOKEN: ${{secrets.SENTRY_TOKEN}}
Expand All @@ -75,7 +75,7 @@ jobs:
outputs:
releases_created: ${{ steps.tag-release.outputs.releases_created }}
steps:
- uses: GoogleCloudPlatform/release-please-action@v3
- uses: googleapis/release-please-action@v4
id: tag-release
with:
path: packages/edge-gateway
Expand All @@ -92,17 +92,17 @@ jobs:
- test
- changelog
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2.2.3
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 7
- uses: actions/setup-node@v3
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- name: Deploy
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3
env:
ENV: 'production' # inform the build process what the env is
SENTRY_TOKEN: ${{ secrets.SENTRY_TOKEN }}
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/ipfs-gateway-race.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
name: Typecheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
- uses: actions/setup-node@v2
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- name: Typecheck
Expand All @@ -38,13 +38,13 @@ jobs:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
- uses: actions/setup-node@v2
version: 9
- uses: actions/setup-node@v4
with:
node-version: 16
node-version: 20
cache: 'pnpm'
- run: pnpm install
- name: Test
Expand All @@ -57,7 +57,7 @@ jobs:
outputs:
releases_created: ${{ steps.tag-release.outputs.releases_created }}
steps:
- uses: GoogleCloudPlatform/release-please-action@v3
- uses: googleapis/release-please-action@v4
id: tag-release
with:
path: packages/ipfs-gateway-race
Expand All @@ -74,13 +74,13 @@ jobs:
- test
- changelog
steps:
- uses: actions/checkout@v2
- uses: pnpm/action-setup@v2.0.1
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
version: 6.32.x
version: 9
- uses: actions/setup-node@v2
with:
node-version: 16
node-version: 20
registry-url: https://registry.npmjs.org/
cache: 'pnpm'
- run: pnpm install
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @web3-storage/reads Developer's Guide
# @storacha/reads Developer's Guide

This doc should contain everything you need to know to get a working development environment up and running. If it doesn't and you know what's missing, please open a PR or issue to update the guide!

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @web3-storage/reads
# @storacha/reads

> Libraries and services that compose the web3.storage read pipeline
Expand All @@ -14,10 +14,10 @@

# Contributing

Feel free to join in. All welcome. [Open an issue](https://github.com/web3-storage/reads/issues)!
Feel free to join in. All welcome. [Open an issue](https://github.com/storacha/reads/issues)!

If you're opening a pull request, please see the [guidelines in DEVELOPMENT.md](./DEVELOPMENT.md#how-should-i-write-my-commits) on structuring your commit messages so that your PR will be compatible with our [release process](./DEVELOPMENT.md#release).

# License

Dual-licensed under [MIT + Apache 2.0](https://github.com/web3-storage/reads/blob/main/LICENSE.md)
Dual-licensed under [MIT + Apache 2.0](https://github.com/storacha/reads/blob/main/LICENSE.md)
Loading

0 comments on commit 1d99326

Please sign in to comment.