Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/catch-up-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ jobs:
contents: write
pull-requests: write

services:
redis:
image: redis:7-alpine
ports:
- 6379:6379
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5

steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -102,13 +113,6 @@ jobs:
if: steps.versions.outputs.needs_update == 'true'
run: pnpm build

- name: Start Docker services
if: steps.versions.outputs.needs_update == 'true'
run: |
docker compose up -d
sleep 5
docker ps

- name: Install Playwright browsers
if: steps.versions.outputs.needs_update == 'true'
run: |
Expand All @@ -127,18 +131,14 @@ jobs:
if: steps.versions.outputs.needs_update == 'true'
id: test_redis
run: |
# Flush Redis
docker exec nextjs-cache-redis redis-cli FLUSHALL
# Flush Redis (service container is accessible on localhost)
redis-cli -h localhost FLUSHALL

# Build and test with Redis
cd apps/e2e-test-app
CACHE_HANDLER=redis pnpm build
CACHE_HANDLER=redis pnpm test:e2e

- name: Stop Docker services
if: always()
run: docker compose down || true

- name: Create branch and commit
if: steps.versions.outputs.needs_update == 'true' && inputs.dry_run != true
run: |
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/nextjs-version-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ jobs:
contents: write
pull-requests: write

services:
redis:
image: redis:7-alpine
ports:
- 6379:6379
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5

outputs:
needs_update: ${{ steps.check_version.outputs.needs_update }}
latest_version: ${{ steps.check_version.outputs.latest_version }}
Expand All @@ -38,7 +49,8 @@ jobs:
id: check_version
run: |
# Get current Next.js version from e2e-test-app (what we're testing against)
CURRENT_NEXTJS=$(node -p "require('./apps/e2e-test-app/package.json').dependencies.next")
# Strip semver range prefix (^, ~, >=, etc.) to get bare version for comparison
CURRENT_NEXTJS=$(node -p "require('./apps/e2e-test-app/package.json').dependencies.next.replace(/^[^0-9]*/, '')")
echo "Current Next.js in e2e-test-app: $CURRENT_NEXTJS"

# Get current package version
Expand Down Expand Up @@ -139,13 +151,6 @@ jobs:
if: steps.check_version.outputs.needs_update == 'true' && steps.branch_check.outputs.branch_exists != 'true'
run: pnpm build

- name: Start Docker services
if: steps.check_version.outputs.needs_update == 'true' && steps.branch_check.outputs.branch_exists != 'true'
run: |
docker compose up -d
sleep 5
docker ps

- name: Install Playwright browsers
if: steps.check_version.outputs.needs_update == 'true' && steps.branch_check.outputs.branch_exists != 'true'
run: |
Expand All @@ -164,8 +169,8 @@ jobs:
- name: Run e2e tests with Redis
if: steps.check_version.outputs.needs_update == 'true' && steps.branch_check.outputs.branch_exists != 'true'
run: |
# Flush Redis
docker exec nextjs-cache-redis redis-cli FLUSHALL
# Flush Redis (service container is accessible on localhost)
redis-cli -h localhost FLUSHALL

# Build and test with Redis
cd apps/e2e-test-app
Expand All @@ -174,10 +179,6 @@ jobs:
continue-on-error: true
id: test_redis

- name: Stop Docker services
if: always()
run: docker compose down || true

- name: Commit changes
if: steps.check_version.outputs.needs_update == 'true' && steps.branch_check.outputs.branch_exists != 'true'
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: Publish to npm

on:
release:
types: [published]
push:
tags:
- "v*.*.*"
Expand Down
Loading