Skip to content

Commit 543091b

Browse files
committed
Update templated files to rev 21c6136 (#688)
Automatically created PR based on commit 21c613607269f5d2025368b762f29c7f9f0d9064 in stackabletech/operator-templating repo. Triggered by: Manual run triggered by: razvan with message [GH action updates]
1 parent 979b591 commit 543091b

File tree

7 files changed

+16
-221
lines changed

7 files changed

+16
-221
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- uses: Swatinem/rust-cache@359a70e43a0bb8a13953b04a90f76428b4959bb6 # v2.2.0
4343
with:
4444
key: udeps
45-
- run: cargo install cargo-udeps
45+
- run: cargo install --locked cargo-udeps@0.1.39
4646
- run: cargo udeps --workspace
4747

4848
# This job evaluates the github environment to determine why this action is running and selects the appropriate
@@ -139,18 +139,19 @@ jobs:
139139
with:
140140
key: clippy
141141
- name: Run clippy action to produce annotations
142+
uses: giraffate/clippy-action@13b9d32482f25d29ead141b79e7e04e7900281e0 # v1.0.1
142143
env:
143144
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
144-
uses: actions-rs/clippy-check@b5b5f21f4797c02da247df37026fcd0a5024aa4d # renovate: tag=v1.0.7
145145
if: env.GITHUB_TOKEN != null
146146
with:
147-
args: --all-targets -- -D warnings
148-
token: ${{ secrets.GITHUB_TOKEN }}
147+
clippy_flags: --all-targets -- -D warnings
148+
reporter: 'github-pr-review'
149+
github_token: ${{ secrets.GITHUB_TOKEN }}
149150
- name: Run clippy manually without annotations
150151
env:
151152
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
152153
if: env.GITHUB_TOKEN == null
153-
run: cargo clippy --all-targets -- -D warnings
154+
run: cargo clippy --color never -q --all-targets -- -D warnings
154155

155156
run_rustdoc:
156157
name: Run RustDoc
@@ -200,9 +201,9 @@ jobs:
200201
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
201202
with:
202203
submodules: recursive
203-
- uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
204+
- uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # v4.6.1
204205
with:
205-
python-version: '3.10'
206+
python-version: '3.11'
206207
- name: Install jinja2-cli
207208
run: pip install jinja2-cli==0.8.2
208209
- name: Regenerate charts
@@ -296,21 +297,17 @@ jobs:
296297
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
297298
with:
298299
submodules: recursive
299-
- uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
300-
if: ${{ github.event_name == 'pull_request' }}
301300
- uses: dtolnay/[email protected]
302301
with:
303302
components: rustfmt
304-
- name: Install requirements for version tool
305-
if: ${{ github.event_name == 'pull_request' }}
306-
run: pip install -r python/requirements.txt
307-
308303
# This step checks if the current run was triggered by a push to a pr (or a pr being created).
309304
# If this is the case it changes the version of this project in all Cargo.toml files to include the suffix
310305
# "-pr<prnumber>" so that the published artifacts can be linked to this PR.
311306
- name: Update version if PR
312307
if: ${{ github.event_name == 'pull_request' }}
313-
run: python/cargo_version.py -m pr${{ github.event.pull_request.number }}
308+
run: |
309+
cargo install cargo-edit --version 0.11.11
310+
cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
314311
315312
# Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
316313
# default value in the makefile if called from this action, but not otherwise (i.e. when called locally).

.github/workflows/daily_security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
18-
- uses: actions-rs/audit-check@35b7b53b1e25b55642157ac01b4adceb5b9ebef3 # renovate: tag=v1.2.0
18+
- uses: rustsec/audit-check@dd51754d4e59da7395a4cd9b593f0ff2d61a9b95 # v1.4.1
1919
with:
2020
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/reviewdog.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
25-
- uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
25+
- uses: actions/setup-python@13ae5bb136fac2878aff31522b9efb785519f984 # v4.6.1
2626
with:
27-
python-version: "3.9"
27+
python-version: "3.11"
2828
- uses: reviewdog/action-flake8@b6435e67f0cfda225b9e0c9283cfb7ea7c551bdb # tag=v3.6.0
2929
with:
3030
github_token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@ crate-hashes.json
1414
result
1515
image.tar
1616

17-
tilt_options.json
18-
19-
**/bundle/
20-
**/bundle.Dockerfile
17+
tilt_options.json

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ publish: build docker-publish helm-publish
8080

8181
run-dev:
8282
kubectl apply -f deploy/stackable-operators-ns.yaml
83-
nix run -f. tilt -- up --port 5444 --namespace stackable-operators
83+
nix run -f. tilt -- up --port 5445 --namespace stackable-operators

python/cargo_version.py

Lines changed: 0 additions & 197 deletions
This file was deleted.

python/requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)