Skip to content

Commit

Permalink
[puppetsync] Clean up for linters
Browse files Browse the repository at this point in the history
Clean up files distributed by puppetsync for various linters.

Also fix a quoting issue in create-github-release action.
  • Loading branch information
silug committed Jul 24, 2024
1 parent 52f79a0 commit 7b3d8fa
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/add_new_issue_to_triage_project.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Add new issues to triage project

on:
'on':
issues:
types:
- opened
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release_rpms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
---
name: 'RELENG: Build + attach RPMs to GitHub Release'

on:
'on':
workflow_dispatch:
inputs:
release_tag:
Expand Down Expand Up @@ -71,10 +71,10 @@ on:
description: "Dry run (Test-build RPMs)"
required: false
default: 'no'
#verbose:
# description: 'Verbose RPM builds when "yes"'
# required: false
# default: 'no'
# verbose:
# description: 'Verbose RPM builds when "yes"'
# required: false
# default: 'no'
rebuild_number:
description: 'If this is an RPM rebuild, put the number of the rebuild here'
required: false
Expand Down Expand Up @@ -255,13 +255,13 @@ jobs:
simp_core_ref_for_building_rpms: ${{ secrets.SIMP_CORE_REF_FOR_BUILDING_RPMS }}
simp_builder_docker_image: 'docker.io/simpproject/simp_build_${{ github.event.inputs.build_container_os }}:latest'
path_to_build: "${{ (github.event.inputs.path_to_build != null && format('{0}/{1}', github.workspace, github.event.inputs.path_to_build)) || github.workspace }}"
verbose: 'no' #${{ github.event.inputs.verbose }}
verbose: 'no' # ${{ github.event.inputs.verbose }}
- name: "Wipe all previous assets from GitHub Release (when clean == 'yes')"
if: ${{ github.event.inputs.clean == 'yes' && github.event.inputs.dry_run != 'yes' }}
uses: actions/github-script@v6
env:
release_id: ${{ steps.release-api.outputs.id }}
release_id: ${{ steps.release-api.outputs.id }}
with:
github-token: ${{ github.event.inputs.target_repo_token || secrets.GITHUB_TOKEN }}
script: |
Expand All @@ -282,7 +282,7 @@ jobs:
env:
rpm_file_paths: ${{ steps.build-and-sign-rpm.outputs.rpm_file_paths }}
rpm_gpg_file: ${{ steps.build-and-sign-rpm.outputs.rpm_gpg_file }}
release_id: ${{ steps.release-api.outputs.id }}
release_id: ${{ steps.release-api.outputs.id }}
clobber: ${{ github.event.inputs.clobber }}
clean: ${{ github.event.inputs.clean }}
dry_run: ${{ github.event.inputs.dry_run }}
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/tag_deploy_rubygem__github-rpms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
---
name: 'Tag: Release to GitHub w/RPMs'

on:
'on':
push:
tags:
# NOTE: These filter patterns aren't actually regexes:
Expand All @@ -49,7 +49,7 @@ on:
- '[0-9]+\.[0-9]+\.[0-9]+\-[a-z]+[0-9]+'

env:
PUPPET_VERSION: '~> 7'
PUPPET_VERSION: '~> 8'
LOCAL_WORKFLOW_CONFIG_FILE: .github/workflows.local.json

jobs:
Expand Down Expand Up @@ -109,7 +109,8 @@ jobs:
create-github-release:
name: Deploy GitHub Release
needs: [ releng-checks ]
needs:
- releng-checks
if: github.repository_owner == 'simp'
runs-on: ubuntu-latest
outputs:
Expand Down Expand Up @@ -162,13 +163,14 @@ jobs:
run: |
echo "${RELEASE_MESSAGE}" > /tmp/.commit-msg.txt
args=(-F /tmp/.commit-msg.txt)
[[ ${{ steps.tag-check.outputs.prerelease }} == yes ]] && args+=(--prerelease)
[[ "${{ steps.tag-check.outputs.prerelease }}" == yes ]] && args+=(--prerelease)
gh release create ${args[@]} "$TARGET_TAG"
build-and-attach-rpms:
name: Trigger RPM release
needs: [ create-github-release ]
needs:
- create-github-release
if: github.repository_owner == 'simp'
runs-on: ubuntu-latest
env:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/validate_tokens_asset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
---
name: 'Manual: Validate API tokens'

on:
'on':
- workflow_dispatch

jobs:
Expand Down Expand Up @@ -52,4 +52,3 @@ jobs:
echo "::debug ::${scopes}"
exit 1
fi

0 comments on commit 7b3d8fa

Please sign in to comment.