Skip to content

Commit d8c067f

Browse files
debug
1 parent acbb12e commit d8c067f

16 files changed

+47
-1028
lines changed

.github/workflows/make-releases.yml

+47-15
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,32 @@ on:
44
workflow_dispatch:
55

66
jobs:
7+
meta:
8+
runs-on: ubuntu-latest
9+
outputs:
10+
tag: ${{steps.meta.outputs.tag}}
11+
steps:
12+
13+
- name: Checkout Code
14+
uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
18+
- name: GetMetadata
19+
id: meta
20+
run: |
21+
set -eu
22+
tag=$(git describe --tags --abbrev=0)
23+
24+
echo "tag=${tag}" >> $GITHUB_OUTPUT
25+
726
build:
827
name: "NGINX: ${{ matrix.nginx-version }}; libjwt: ${{ matrix.libjwt-version }}"
28+
needs: meta
929
strategy:
1030
matrix:
1131
# NGINX versions to build/test against
12-
nginx-version: ['1.20.2', '1.22.1', '1.24.0', '1.26.2', '1.27.3']
32+
nginx-version: ['1.20.2'] #, '1.22.1', '1.24.0', '1.26.2', '1.27.3']
1333

1434
# The following versions of libjwt are compatible:
1535
# * v1.0 - v1.12.0
@@ -19,26 +39,22 @@ jobs:
1939
# * Debian and Ubuntu's repos have v1.10.2
2040
# * EPEL has v1.12.1
2141
# This compiles against each version prior to a breaking change and the latest release
22-
libjwt-version: ['1.12.0', '1.14.0', '1.15.3']
42+
libjwt-version: ['1.12.0'] #, '1.14.0', '1.15.3']
2343
runs-on: ubuntu-latest
2444
steps:
2545

2646
- name: Checkout Code
2747
uses: actions/checkout@v4
2848
with:
29-
fetch-depth: 0
3049
path: ngx-http-auth-jwt-module
3150

3251
- name: Get Metadata
3352
id: meta
3453
run: |
35-
set -eux
36-
cd ngx-http-auth-jwt-module
37-
38-
tag=$(git describe --tags --abbrev=0)
39-
54+
set -eu
4055
echo "filename=ngx-http-auth-jwt-module-${tag}_libjwt-${{matrix.libjwt-version}}_nginx-${{matrix.nginx-version}}.tgz" >> $GITHUB_OUTPUT
4156
57+
4258
# TODO cache the build result so we don't have to do this every time?
4359
- name: Download jansson
4460
uses: actions/checkout@v4
@@ -104,11 +120,14 @@ jobs:
104120
uses: actions/upload-artifact@v4
105121
with:
106122
if-no-files-found: error
107-
name: ${{steps.meta.outputs.filename}}
123+
name: release
124+
path: ${{steps.meta.outputs.filename}}
108125

109126
release:
110127
name: Create/Update Release
111-
needs: build
128+
needs:
129+
- meta
130+
- build
112131
runs-on: ubuntu-latest
113132
permissions:
114133
contents: write
@@ -119,25 +138,38 @@ jobs:
119138
run: |
120139
echo "date_now=$(date --rfc-3339=seconds)" >> "${GITHUB_OUTPUT}"
121140
122-
- name: Download Build Artifacts
141+
- name: Download Artifacts
123142
uses: actions/download-artifact@v4
124143
with:
125144
path: artifacts
126145

127-
- name: Upload Builds to Release
146+
- name: Flatten Artifacts
147+
run: |
148+
set -eu
149+
150+
cd artifacts
151+
152+
for f in $(find . -type f); do
153+
echo "Staging: ${f}"
154+
mv "${f}" .
155+
done
156+
157+
find . -type d -mindepth 1 -exec rm -rf "{}" +
158+
159+
- name: Create/Update Release
128160
uses: ncipollo/release-action@v1
129161
with:
130-
name: 'Development Build: ${{ github.ref_name }}@${{ github.sha }}'
162+
tag: ${{needs.meta.outputs.tag}}
163+
name: "Pre-release: ${{ github.ref_name }}@${{ github.sha }}"
131164
body: |
132165
> [!WARNING]
133166
> This is an automatically generated pre-release version of the module, which includes the latest master branch changes.
134167
> Please report any bugs you find.
135168
136169
- Build Date: `${{ steps.vars.outputs.date_now }}`
137-
- Commit: ${{ github.sha }}
170+
- Commit: `${{ github.sha }}`
138171
prerelease: true
139172
allowUpdates: true
140173
removeArtifacts: true
141174
artifactErrorsFailBuild: true
142175
artifacts: artifacts/*
143-
tag: dev-build

test/docker-compose-test.yml

-19
This file was deleted.

test/ec_key_256.pem

-5
This file was deleted.

test/ec_key_384.pem

-6
This file was deleted.

test/ec_key_521.pem

-8
This file was deleted.

0 commit comments

Comments
 (0)