Skip to content

Commit 666d8c9

Browse files
fix workflow
1 parent 81a2b44 commit 666d8c9

File tree

1 file changed

+33
-12
lines changed

1 file changed

+33
-12
lines changed

.github/workflows/make-releases.yml

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Make Releases
22

33
on:
44
push:
@@ -9,8 +9,22 @@ on:
99
workflow_dispatch:
1010

1111
jobs:
12+
metadata:
13+
name: Metadata
14+
runs-on: ununtu-latest
15+
outputs:
16+
tag: ${{ steps.metadata.outputs.tag }}
17+
steps:
18+
- name: Get Metadata
19+
id: metadata
20+
run: |
21+
tag=$(git describe --tags --abbrev=0)
22+
23+
echo "tag=${tag}" >> $GITHUB_OUTPUT
24+
1225
build:
1326
name: "NGINX: ${{ matrix.nginx-version }}; libjwt: ${{ matrix.libjwt-version }}"
27+
needs: metadata
1428
strategy:
1529
matrix:
1630
# NGINX versions to build/test against
@@ -27,6 +41,7 @@ jobs:
2741
libjwt-version: ['1.12.0', '1.14.0', '1.15.3']
2842
runs-on: ubuntu-latest
2943
steps:
44+
3045
- name: Checkout Code
3146
uses: actions/checkout@v3
3247
with:
@@ -82,44 +97,50 @@ jobs:
8297
BUILD_FLAGS="${BUILD_FLAGS} --with-cc-opt='-DNGX_LINKED_LIST_COOKIES=1'"
8398
fi
8499
85-
./configure --with-compat --add-dynamic-module=../ngx-http-auth-jwt-module ${BUILD_FLAGS}
100+
./configure --with-compat --without-http_rewrite_module --add-dynamic-module=../ngx-http-auth-jwt-module ${BUILD_FLAGS}
86101
87102
- name: Make Modules
88103
working-directory: ./nginx
89104
run: make modules
90105

91-
- name: Create release archive
106+
- name: Determine Archive Info
107+
id: archive-info
108+
run: |
109+
echo "filename=ngx_http_auth_jwt_module_libjwt_${{matrix.libjwt-version}}_nginx_${{matrix.nginx-version}}_${{needs.metadata.outpus.tag}}.tgz"
110+
111+
- name: Create Release Archive
92112
run: |
93113
cp ./nginx/objs/ngx_http_auth_jwt_module.so ./
94-
tar czf ngx_http_auth_jwt_module_libjwt_${{matrix.libjwt-version}}_nginx_${{matrix.nginx-version}}.tgz ngx_http_auth_jwt_module.so
114+
tar czf ${{steps.archive-info.outputs.archive-info.filename}} ngx_http_auth_jwt_module.so
95115
96-
- name: Upload build artifact
116+
- name: Upload Build Artifact
97117
uses: actions/upload-artifact@v4
98118
with:
99119
if-no-files-found: error
100-
name: ngx_http_auth_jwt_module_libjwt_${{matrix.libjwt-version}}_nginx_${{matrix.nginx-version}}.tgz
101-
path: ngx_http_auth_jwt_module_libjwt_${{matrix.libjwt-version}}_nginx_${{matrix.nginx-version}}.tgz
120+
name: ${{steps.archive-info.outputs.archive-info.filename}}
121+
path: ${{steps.archive-info.outputs.archive-info.filename}}
102122

103123
update_releases_page:
104-
name: Upload builds to Releases
124+
name: Upload Release
105125
if: github.event_name != 'pull_request'
106126
needs:
107127
- build
108128
runs-on: ubuntu-latest
109129
permissions:
110130
contents: write
111131
steps:
112-
- name: Set up variables
132+
133+
- name: Set-up Variables
113134
id: vars
114135
run: |
115136
echo "date_now=$(date --rfc-3339=seconds)" >> "${GITHUB_OUTPUT}"
116137
117-
- name: Download build artifacts from previous jobs
138+
- name: Download Build Artifacts from Previous Jobs
118139
uses: actions/download-artifact@v3
119140
with:
120141
path: artifacts
121142

122-
- name: Upload builds to Releases
143+
- name: Upload Builds to Release
123144
uses: ncipollo/release-action@v1
124145
with:
125146
allowUpdates: true
@@ -128,7 +149,7 @@ jobs:
128149
body: |
129150
> [!WARNING]
130151
> This is an automatically generated pre-release version of the module, which includes the latest master branch changes.
131-
> Please report any bugs you find to the issue tracker.
152+
> Please report any bugs you find.
132153
133154
- Build Date: `${{ steps.vars.outputs.date_now }}`
134155
- Commit: ${{ github.sha }}

0 commit comments

Comments
 (0)