Skip to content

Commit 1221028

Browse files
dsschultric-evansgithub-actions
authored
[minor] switch to using basic auth for client secret (#160)
Switch to using basic auth for client secret, as this is more in line with the RFC and more secure. Also bump the Python minimum version to 3.9. --------- Co-authored-by: ric-evans <emejqz@gmail.com> Co-authored-by: github-actions <github-actions@github.com>
1 parent 267d438 commit 1221028

File tree

10 files changed

+619
-595
lines changed

10 files changed

+619
-595
lines changed

.github/workflows/wipac-cicd.yml

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ jobs:
1010
matrix: ${{ steps.versions.outputs.matrix }}
1111
steps:
1212
- uses: actions/checkout@v4
13+
with:
14+
ref: ${{ github.sha }} # lock to triggered commit (github.ref is dynamic)
1315
- id: versions
1416
uses: WIPACrepo/wipac-dev-py-versions-action@v2.5
1517

@@ -27,6 +29,8 @@ jobs:
2729
py3: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
2830
steps:
2931
- uses: actions/checkout@v4
32+
with:
33+
ref: ${{ github.sha }} # lock to triggered commit (github.ref is dynamic)
3034
- uses: actions/setup-python@v5
3135
with:
3236
python-version: ${{ matrix.py3 }}
@@ -43,6 +47,8 @@ jobs:
4347
py3: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
4448
steps:
4549
- uses: actions/checkout@v4
50+
with:
51+
ref: ${{ github.sha }} # lock to triggered commit (github.ref is dynamic)
4652
- uses: actions/setup-python@v5
4753
with:
4854
python-version: ${{ matrix.py3 }}
@@ -64,7 +70,7 @@ jobs:
6470
# & don't run non-branch triggers (like tags)
6571
# & we don't want to trigger an update on PR's merge to main/master/default (which is a branch)
6672
run: |
67-
set -euo pipefail
73+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
6874
if [[ \
6975
${{github.actor}} != 'dependabot[bot]' && \
7076
${{github.ref_type}} == 'branch' && \
@@ -85,11 +91,12 @@ jobs:
8591
uses: actions/checkout@v4
8692
with:
8793
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
94+
ref: ${{ github.ref }} # dont lock to sha (action needs to push)
8895
- if: needs.writable-branch-detect.outputs.OKAY == 'true'
8996
uses: WIPACrepo/wipac-dev-py-setup-action@v4.3
9097
with:
9198
pypi_name: wipac-rest-tools
92-
python_min: 3.8
99+
python_min: 3.9
93100
author: WIPAC Developers
94101
author_email: developers@icecube.wisc.edu
95102
keywords: "WIPAC, IceCube, REST, tools, utilities, OpenTelemetry, tracing, telemetry"
@@ -101,7 +108,8 @@ jobs:
101108
uses: actions/checkout@v4
102109
with:
103110
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
104-
- uses: WIPACrepo/wipac-dev-py-dependencies-action@v2.2
111+
ref: ${{ github.ref }} # dont lock to sha (action needs to push)
112+
- uses: WIPACrepo/wipac-dev-py-dependencies-action@v2.3
105113
with:
106114
use_directory: true
107115

@@ -119,17 +127,19 @@ jobs:
119127
py3: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
120128
steps:
121129
- uses: actions/checkout@v4
130+
with:
131+
ref: ${{ github.sha }} # lock to triggered commit (github.ref is dynamic)
122132
- uses: actions/setup-python@v5
123133
with:
124134
python-version: ${{ matrix.py3 }}
125135
- name: Setup Dependencies
126136
run: |
127-
set -euo pipefail
137+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
128138
pip install --upgrade pip wheel setuptools
129139
pip install .[tests]
130140
- name: Run Tests
131141
run: |
132-
set -euo pipefail
142+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
133143
python -m pytest tests/unit_* --tb=short --log-level=DEBUG -vvv
134144
pycycle --here --verbose
135145
@@ -142,17 +152,19 @@ jobs:
142152
py3: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
143153
steps:
144154
- uses: actions/checkout@v4
155+
with:
156+
ref: ${{ github.sha }} # lock to triggered commit (github.ref is dynamic)
145157
- uses: actions/setup-python@v5
146158
with:
147159
python-version: ${{ matrix.py3 }}
148160
- name: Setup Dependencies
149161
run: |
150-
set -euo pipefail
162+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
151163
pip install --upgrade pip wheel setuptools
152164
pip install .[tests,openapi]
153165
- name: Run Tests
154166
run: |
155-
set -euo pipefail
167+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
156168
python -m pytest tests/integrate_openapi --tb=short --log-level=DEBUG -vvv
157169
pycycle --here --verbose
158170
@@ -165,22 +177,24 @@ jobs:
165177
py3: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
166178
steps:
167179
- uses: actions/checkout@v4
180+
with:
181+
ref: ${{ github.sha }} # lock to triggered commit (github.ref is dynamic)
168182
- uses: actions/setup-python@v5
169183
with:
170184
python-version: ${{ matrix.py3 }}
171185
- name: Setup Dependencies
172186
run: |
173-
set -euo pipefail
187+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
174188
pip install --upgrade pip wheel setuptools
175189
pip install .[telemetry,tests]
176190
- name: Run Tests
177191
run: |
178-
set -euo pipefail
192+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
179193
python -m pytest tests/unit_* --tb=short --log-level=DEBUG
180194
pycycle --here --verbose
181195
- name: Run Integration Test
182196
run: |
183-
set -euo pipefail
197+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
184198
cd examples/
185199
python rest_server.py &
186200
python rest_client.py
@@ -212,7 +226,7 @@ jobs:
212226

213227
- name: Setup | Force correct release branch on workflow sha
214228
run: |
215-
set -euo pipefail
229+
set -euo pipefail; echo "now: $(date -u +"%Y-%m-%dT%H:%M:%S.%3N")"
216230
git checkout -B ${{ github.ref_name }} ${{ github.sha }}
217231
218232
- name: Action | Semantic Version Release

0 commit comments

Comments
 (0)