Skip to content

Commit 3f46b51

Browse files
committed
[puppetsync] Clean up for linters
Clean up files distributed by puppetsync for various linters. Also fix a quoting issue in create-github-release action.
1 parent c1f6144 commit 3f46b51

File tree

4 files changed

+34
-15
lines changed

4 files changed

+34
-15
lines changed

.github/workflows/add_new_issue_to_triage_project.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
1+
# Add new issues to triage project board (https://github.com/orgs/simp/projects/11)
2+
# ------------------------------------------------------------------------------
3+
#
4+
# NOTICE: **This file is maintained with puppetsync**
5+
#
6+
# This file is updated automatically as part of a puppet module baseline.
7+
#
8+
# The next baseline sync will overwrite any local changes to this file!
9+
#
10+
# ==============================================================================
11+
# This pipeline uses the following GitHub Action Secrets:
12+
#
13+
# GitHub Secret variable Notes
14+
# ------------------------------- ---------------------------------------
15+
# AUTO_TRIAGE_TOKEN Token with appropriate permissions
16+
#
17+
# ------------------------------------------------------------------------------
18+
#
19+
#
120
---
221
name: Add new issues to triage project
322

4-
on:
23+
'on':
524
issues:
625
types:
726
- opened

.github/workflows/release_rpms.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
---
3232
name: 'RELENG: Build + attach RPMs to GitHub Release'
3333

34-
on:
34+
'on':
3535
workflow_dispatch:
3636
inputs:
3737
release_tag:
@@ -71,10 +71,10 @@ on:
7171
description: "Dry run (Test-build RPMs)"
7272
required: false
7373
default: 'no'
74-
#verbose:
75-
# description: 'Verbose RPM builds when "yes"'
76-
# required: false
77-
# default: 'no'
74+
# verbose:
75+
# description: 'Verbose RPM builds when "yes"'
76+
# required: false
77+
# default: 'no'
7878
rebuild_number:
7979
description: 'If this is an RPM rebuild, put the number of the rebuild here'
8080
required: false
@@ -255,13 +255,13 @@ jobs:
255255
simp_core_ref_for_building_rpms: ${{ secrets.SIMP_CORE_REF_FOR_BUILDING_RPMS }}
256256
simp_builder_docker_image: 'docker.io/simpproject/simp_build_${{ github.event.inputs.build_container_os }}:latest'
257257
path_to_build: "${{ (github.event.inputs.path_to_build != null && format('{0}/{1}', github.workspace, github.event.inputs.path_to_build)) || github.workspace }}"
258-
verbose: 'no' #${{ github.event.inputs.verbose }}
258+
verbose: 'no' # ${{ github.event.inputs.verbose }}
259259
260260
- name: "Wipe all previous assets from GitHub Release (when clean == 'yes')"
261261
if: ${{ github.event.inputs.clean == 'yes' && github.event.inputs.dry_run != 'yes' }}
262262
uses: actions/github-script@v6
263263
env:
264-
release_id: ${{ steps.release-api.outputs.id }}
264+
release_id: ${{ steps.release-api.outputs.id }}
265265
with:
266266
github-token: ${{ github.event.inputs.target_repo_token || secrets.GITHUB_TOKEN }}
267267
script: |
@@ -282,7 +282,7 @@ jobs:
282282
env:
283283
rpm_file_paths: ${{ steps.build-and-sign-rpm.outputs.rpm_file_paths }}
284284
rpm_gpg_file: ${{ steps.build-and-sign-rpm.outputs.rpm_gpg_file }}
285-
release_id: ${{ steps.release-api.outputs.id }}
285+
release_id: ${{ steps.release-api.outputs.id }}
286286
clobber: ${{ github.event.inputs.clobber }}
287287
clean: ${{ github.event.inputs.clean }}
288288
dry_run: ${{ github.event.inputs.dry_run }}

.github/workflows/tag_deploy_github-rpms.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
---
3030
name: 'Tag: Release to GitHub w/RPMs'
3131

32-
on:
32+
'on':
3333
push:
3434
tags:
3535
# NOTE: These filter patterns aren't actually regexes:
@@ -38,7 +38,7 @@ on:
3838
- '[0-9]+\.[0-9]+\.[0-9]+\-[a-z]+[0-9]+'
3939

4040
env:
41-
PUPPET_VERSION: '~> 7'
41+
PUPPET_VERSION: '~> 8'
4242

4343
jobs:
4444
create-github-release:
@@ -95,13 +95,14 @@ jobs:
9595
run: |
9696
echo "${RELEASE_MESSAGE}" > /tmp/.commit-msg.txt
9797
args=(-F /tmp/.commit-msg.txt)
98-
[[ ${{ steps.tag-check.outputs.prerelease }} == yes ]] && args+=(--prerelease)
98+
[[ "${{ steps.tag-check.outputs.prerelease }}" == yes ]] && args+=(--prerelease)
9999
100100
gh release create ${args[@]} "$TARGET_TAG"
101101
102102
build-and-attach-rpms:
103103
name: Trigger RPM release
104-
needs: [ create-github-release ]
104+
needs:
105+
- create-github-release
105106
if: github.repository_owner == 'simp'
106107
runs-on: ubuntu-latest
107108
env:

.github/workflows/validate_tokens_asset.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
---
2121
name: 'Manual: Validate API tokens'
2222

23-
on:
23+
'on':
2424
- workflow_dispatch
2525

2626
jobs:
@@ -52,4 +52,3 @@ jobs:
5252
echo "::debug ::${scopes}"
5353
exit 1
5454
fi
55-

0 commit comments

Comments
 (0)