Skip to content

ci: upgrade actions #158

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.

Sign up for GitHub

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

Merged
dunglas merged 2 commits into from
Jun 28, 2023
Merged

ci: upgrade actions #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b6e24d
ci: upgrade actions
dunglas Jun 28, 2023
5548997
test: remove useless test
dunglas Jun 28, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/push.yaml → .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
install: true

- name: Build test image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: ./
file: ${{ matrix.dockerfile }}
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Run tests
run: |
docker load -i /tmp/.builder.tar
docker run --rm frankenphp:${{ github.sha }}-builder "go test -race -v"
docker run --rm frankenphp:${{ github.sha }}-builder "sh -c 'go test -race -v ./... && cd caddy && go test -race -v ./...'"
push-image:
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -86,11 +86,11 @@ jobs:
with:
install: true

- name: Setup QEMU
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Build and Push Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: ./
file: ${{ matrix.dockerfile }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yaml → .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
install: true

- name: Build test image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: ./
file: ${{ matrix.dockerfile }}
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Run tests
run: |
docker load -i /tmp/.builder.tar
docker run --rm frankenphp:${{ github.sha }}-builder "go test -a -v"
docker run --rm frankenphp:${{ github.sha }}-builder "sh -c 'go test -race -v ./... && cd caddy && go test -race -v ./...'"
push-image:
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -75,11 +75,11 @@ jobs:
with:
install: true

- name: Setup QEMU
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Build and Push Image
uses: docker/build-push-action@v3
- name: Build Image
uses: docker/build-push-action@v4
with:
context: ./
file: ${{ matrix.dockerfile }}
Expand Down
14 changes: 0 additions & 14 deletions caddy/caddy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,3 @@ func TestPHP(t *testing.T) {
}
wg.Wait()
}

func TestAutoHTTPtoHTTPSRedirectsImplicitPort(t *testing.T) {
tester := caddytest.NewTester(t)
tester.InitServer(`
{
http_port 9080
https_port 9443
}
localhost
respond "Yahaha! You found me!"
`, "caddyfile")

tester.AssertRedirect("http://localhost:9080/", "https://localhost/", http.StatusPermanentRedirect)
}