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: point staging to release v1.7.1 #493

Open
wants to merge 33 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b6f5c97
chore: update deploy.yml
SgtPooki Nov 13, 2024
6a05cba
chore: dont push to staging-release before create-pr
SgtPooki Nov 13, 2024
e8ae27b
chore: production release pr fix
SgtPooki Nov 13, 2024
2be1f55
chore: debugging prod release pr
SgtPooki Nov 13, 2024
011dded
chore: debugging staging and prod release prs
SgtPooki Nov 13, 2024
f30989c
chore: fix staging release pr
SgtPooki Nov 13, 2024
bbc3b16
chore: fix PR title for prod release
SgtPooki Nov 13, 2024
eff95ae
chore: fix prod release pr
SgtPooki Nov 13, 2024
99b3aa3
chore: prod deploy pr fix
SgtPooki Nov 13, 2024
5a89e0e
chore: prod deploy action checks out all history
SgtPooki Nov 13, 2024
782dbc0
chore: debugging prod deploy pr
SgtPooki Nov 13, 2024
7c87ef7
chore: guard deploy PR checks
SgtPooki Nov 13, 2024
71defd9
deps(dev): bump @playwright/test from 1.48.1 to 1.48.2 (#428)
dependabot[bot] Nov 13, 2024
f5f20f7
ci: bump codecov/codecov-action from 4.3.1 to 4.6.0 (#381)
dependabot[bot] Nov 13, 2024
1926d9b
deps(dev): bump @babel/preset-react from 7.25.7 to 7.25.9 (#418)
dependabot[bot] Nov 13, 2024
6973a87
deps(dev): bump @babel/preset-env from 7.25.8 to 7.26.0 (#433)
dependabot[bot] Nov 13, 2024
8c237e5
deps(dev): bump @babel/preset-typescript from 7.25.7 to 7.26.0 (#429)
dependabot[bot] Nov 13, 2024
aab3c00
fix: dont use local storage for text config items (#448)
SgtPooki Nov 14, 2024
c838307
fix: input toggles dont use localStorage (#450)
SgtPooki Nov 14, 2024
334a077
feat: global config validation (#451)
SgtPooki Nov 14, 2024
3fa32d7
chore(main): release 1.7.0 (#454)
SgtPooki Nov 14, 2024
849d36f
ci: staging deploy PR works on dispatch, push to main
SgtPooki Nov 14, 2024
1b44cdb
ci: fix deploy-staging not creating PR
SgtPooki Nov 14, 2024
1eb5f50
chore: fix deploy PRs
SgtPooki Nov 14, 2024
0f87fcd
chore: attempt to create deploy PR by pointing to tag
SgtPooki Nov 14, 2024
f96431e
chore: fix deploy PR.. we must merge deploy PRs with 'rebase and merge'
SgtPooki Nov 14, 2024
5cd083c
test: config propagation to subdomains (#459)
SgtPooki Nov 14, 2024
65fd112
fix: debug logs enabled on dev environments (#456)
SgtPooki Nov 14, 2024
dcf4ff7
deps: bump @helia/verified-fetch from 2.0.1 to 2.1.0 (#452)
dependabot[bot] Nov 14, 2024
567cfa5
deps(dev): bump @babel/core from 7.25.8 to 7.26.0 (#432)
dependabot[bot] Nov 14, 2024
d50f5bc
chore: use groups for dependabot.yml (#487)
SgtPooki Nov 22, 2024
c16688e
fix: no-sw error shows for subdomain requests (#491)
SgtPooki Nov 22, 2024
9755b14
chore(main): release 1.7.1 (#460)
SgtPooki Nov 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
directories:
- "/"
- "/packages/*"
schedule:
interval: daily
time: "10:00"
open-pull-requests-limit: 20
commit-message:
prefix: "deps"
prefix-development: "deps(dev)"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
commit-message:
prefix: ci
groups:
helia-deps: # group all deps that should be updated when Helia deps need updated
patterns:
- "*helia*"
- "*libp2p*"
- "*multiformats*"
store-deps: # group all blockstore and datastore updates (interface & impl)
patterns:
- "*blockstore*"
- "*datastore*"
kubo-deps: # group kubo, kubo-rpc-client, and ipfsd-ctl updates
patterns:
- "*kubo*"
- "ipfsd-ctl"
39 changes: 16 additions & 23 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
tags:
- '*'
branches:
- staging
workflow_dispatch:

permissions:
Expand All @@ -13,63 +15,54 @@ permissions:
jobs:
# from https://github.com/peter-evans/create-pull-request/blob/main/docs/examples.md#keep-a-branch-up-to-date-with-another
deploy-staging:
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
runs-on: ubuntu-latest
permissions:
pull-requests: write # to create release PR
steps:
- uses: actions/checkout@v4
with:
token: ${{ secrets.SGTPOOKI_PAT }}
ref: staging
- name: Fetch all tags
run: git fetch --tags
- name: Get latest tag
id: get_latest_tag
run: echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT
- name: Checkout latest tag
run: git checkout ${{ steps.get_latest_tag.outputs.tag }}
- name: Ensure staging-release branch points to latest tag
run: |
git checkout -B staging-release ${{ steps.get_latest_tag.outputs.tag }}
git push origin staging-release --force
git reset --hard ${{ steps.get_latest_tag.outputs.tag }}
- name: Create Pull Request
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
with:
token: ${{ secrets.SGTPOOKI_PAT }}
base: staging
branch: staging-release
title: 'chore: point staging to release ${{ steps.get_latest_tag.outputs.tag }}'
body: 'This PR points the staging branch to release ${{ steps.get_latest_tag.outputs.tag }}.'
body: 'This PR points the staging branch to release ${{ steps.get_latest_tag.outputs.tag }}. **Choose "Rebase and merge" for this PR only!**'

# from https://github.com/peter-evans/create-pull-request/blob/main/docs/examples.md#keep-a-branch-up-to-date-with-another
deploy-production:
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/staging')
runs-on: ubuntu-latest
permissions:
pull-requests: write # to create release PR
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch all history so that git commands work correctly
- name: Fetch all branches and tags
run: |
git fetch --all --tags
- name: Get latest tag merged into staging
token: ${{ secrets.SGTPOOKI_PAT }}
ref: production
fetch-depth: 0 # Fetch all branches and commit history
- name: Get latest tag deployed to staging
id: get_latest_tag
run: |
git checkout origin/staging
latest_tag=$(git describe --tags $(git rev-list --tags --merged origin/staging --max-count=1))
latest_tag=$(git --no-pager log origin/staging --all --grep="chore: point staging to release v" --pretty=format:"%H %s" | head -n1 | sed -n 's/.*release \(v[0-9]*\.[0-9]*\.[0-9]*\).*/\1/p')
echo "tag=$latest_tag" >> $GITHUB_OUTPUT
- name: Checkout latest tag
run: git checkout ${{ steps.get_latest_tag.outputs.tag }}
- name: Ensure production-release branch points to latest tag
- name: Set production branch to latest tag deployed to staging
run: |
git checkout -B production-release ${{ steps.get_latest_tag.outputs.tag }}
git push origin production-release --force
git reset --hard ${{ steps.get_latest_tag.outputs.tag }}
- name: Create Pull Request
uses: peter-evans/[email protected]
with:
token: ${{ secrets.SGTPOOKI_PAT }}
base: production
branch: production-release
title: 'chore: Point production to release ${{ steps.get_latest_tag.outputs.tag }}'
body: 'This PR points the production branch to release ${{ steps.get_latest_tag.outputs.tag }}.'
title: 'chore: Point production to ${{ steps.get_latest_tag.outputs.tag }}'
body: 'This PR points the production branch to release ${{ steps.get_latest_tag.outputs.tag }}, which is the latest tag deployed to staging. **Choose "Rebase and merge" for this PR only!**'

16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
node-version: ${{ matrix.node }}
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:node
- uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
flags: node
files: .coverage/*,packages/*/.coverage/*
Expand All @@ -69,7 +69,7 @@ jobs:
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx playwright install --with-deps
- run: npm run --if-present test:chrome
- uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
flags: chrome
files: .coverage/*,packages/*/.coverage/*
Expand All @@ -84,7 +84,7 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome-webworker
- uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
flags: chrome-webworker
files: .coverage/*,packages/*/.coverage/*
Expand All @@ -100,7 +100,7 @@ jobs:
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx playwright install --with-deps
- run: npm run --if-present test:firefox
- uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
flags: firefox
files: .coverage/*,packages/*/.coverage/*
Expand All @@ -115,7 +115,7 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox-webworker
- uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
flags: firefox-webworker
files: .coverage/*,packages/*/.coverage/*
Expand All @@ -130,7 +130,7 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:webkit
- uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
flags: webkit
files: .coverage/*,packages/*/.coverage/*
Expand All @@ -145,7 +145,7 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-main
- uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
flags: electron-main
files: .coverage/*,packages/*/.coverage/*
Expand All @@ -160,7 +160,7 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-renderer
- uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
with:
flags: electron-renderer
files: .coverage/*,packages/*/.coverage/*
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,4 @@ playwright-report
.coverage
test-e2e/fixtures/data/test-repo
test-e2e/fixtures/data/gateway-conformance-fixtures
test-results
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@
# Changelog

## [1.7.1](https://github.com/ipfs/service-worker-gateway/compare/v1.7.0...v1.7.1) (2024-11-22)


### Bug Fixes

* debug logs enabled on dev environments ([#456](https://github.com/ipfs/service-worker-gateway/issues/456)) ([65fd112](https://github.com/ipfs/service-worker-gateway/commit/65fd112d192b200388a37bb4ba403782a46bc18e)), closes [#455](https://github.com/ipfs/service-worker-gateway/issues/455)
* no-sw error shows for subdomain requests ([#491](https://github.com/ipfs/service-worker-gateway/issues/491)) ([c16688e](https://github.com/ipfs/service-worker-gateway/commit/c16688e2d5fb6f9f56146aec4d947d41c0646023))

## [1.7.0](https://github.com/ipfs/service-worker-gateway/compare/v1.6.2...v1.7.0) (2024-11-14)


### Features

* global config validation ([#451](https://github.com/ipfs/service-worker-gateway/issues/451)) ([334a077](https://github.com/ipfs/service-worker-gateway/commit/334a0773f3015290f581abf4f4ac700309988986))


### Bug Fixes

* dont use local storage for text config items ([#448](https://github.com/ipfs/service-worker-gateway/issues/448)) ([aab3c00](https://github.com/ipfs/service-worker-gateway/commit/aab3c00db9ef40fc93996f894df954fbfe4c4d0f))
* input toggles dont use localStorage ([#450](https://github.com/ipfs/service-worker-gateway/issues/450)) ([c838307](https://github.com/ipfs/service-worker-gateway/commit/c83830714475a7a20d949d5bf9f74bf65c7e387d))

## [1.6.2](https://github.com/ipfs/service-worker-gateway/compare/v1.6.1...v1.6.2) (2024-11-13)


Expand Down
Loading
Loading