Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ab#57423 v3.0 mergequeue #86

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 9 additions & 32 deletions .github/workflows/generate-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,19 @@ on:
required: true

jobs:
generate-readme:
update-docs:
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
action: [generate-screenshots, generate-repository-docs, lint-manifest]
steps:
- uses: actions/checkout@v4
name: Checkout project
- name: Checkout
uses: actions/checkout@v4
with:
token: ${{ secrets.token }}

- uses: actions/checkout@v4
name: Checkout templates
- uses: Keyfactor/doctool@main
with:
repository: 'Keyfactor/actions'
path: './actions/'
token: ${{ secrets.token }}
ref: 'v2' # Update this tag for testing new readme templates branches
- uses: Keyfactor/jinja2-action@v1.2.0-multiple-data-files
name: Merge template and manifest with jinja2
with:
template: ./actions/readme-templates/readme.md.tpl
output_file: README.md
data_file: |
integration-manifest.json
./actions/readme-templates/readme_shared_data.json
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Show generated README.md
run: echo $(cat README.md)

- uses: Keyfactor/add-and-commit@v9.1.4
name: Commit generated README
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
add: README.md --force
message: Update generated README
author_name: Keyfactor
author_email: keyfactor@keyfactor.github.io
action: ${{ matrix.action }}
20 changes: 10 additions & 10 deletions .github/workflows/starter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:

jobs:
call-assign-from-json-workflow:
uses: Keyfactor/actions/.github/workflows/assign-env-from-json.yml@v2
uses: Keyfactor/actions/.github/workflows/assign-env-from-json.yml@v3

call-get-primary-language:
outputs:
Expand Down Expand Up @@ -77,12 +77,12 @@ jobs:
echo "platform_matrix=`cat integration-manifest.json | jq '.platform_matrix'`" | tee -a $GITHUB_OUTPUT | tee -a $GITHUB_STEP_SUMMARY

call-create-github-release-workflow:
uses: Keyfactor/actions/.github/workflows/github-release.yml@v2
uses: Keyfactor/actions/.github/workflows/github-release.yml@v3

call-dotnet-build-and-release-workflow:
needs: [call-get-primary-language, call-assign-from-json-workflow, call-create-github-release-workflow]
if: needs.call-get-primary-language.outputs.primary_language == 'C#'
uses: keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@v2
uses: keyfactor/actions/.github/workflows/dotnet-build-and-release.yml@v3
with:
release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
Expand All @@ -94,7 +94,7 @@ jobs:
call-go-build-and-release-workflow:
needs: [call-get-primary-language, call-assign-from-json-workflow, call-create-github-release-workflow,call-goreleaser-exists]
if: needs.call-get-primary-language.outputs.primary_language == 'Go' && needs.call-goreleaser-exists.outputs.goreleaser-exists == 'true'
uses: keyfactor/actions/.github/workflows/go-build-and-release.yml@v2
uses: keyfactor/actions/.github/workflows/go-build-and-release.yml@v3
with:
release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
secrets:
Expand All @@ -105,7 +105,7 @@ jobs:
call-container-build-and-release-workflow:
needs: [call-get-primary-language, call-assign-from-json-workflow, call-create-github-release-workflow,call-goreleaser-exists,setup_platforms]
if: needs.call-get-primary-language.outputs.primary_language == 'Go' && needs.call-goreleaser-exists.outputs.goreleaser-exists == 'false'
uses: keyfactor/actions/.github/workflows/container-build-and-release.yml@v2
uses: keyfactor/actions/.github/workflows/container-build-and-release.yml@v3
with:
release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
platform_list: ${{ fromJson(needs.setup_platforms.outputs.platform_matrix) }}
Expand All @@ -116,7 +116,7 @@ jobs:
call-maven-build-and-release-workflow:
needs: [call-get-primary-language, call-assign-from-json-workflow, call-create-github-release-workflow]
if: needs.call-get-primary-language.outputs.primary_language == 'Java'
uses: keyfactor/actions/.github/workflows/maven-build-and-release.yml@v2
uses: keyfactor/actions/.github/workflows/maven-build-and-release.yml@v3
with:
release_version: ${{ needs.call-create-github-release-workflow.outputs.release_version }}
release_url: ${{ needs.call-create-github-release-workflow.outputs.release_url }}
Expand All @@ -126,27 +126,27 @@ jobs:

call-generate-readme-workflow:
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
uses: Keyfactor/actions/.github/workflows/generate-readme.yml@v2
uses: Keyfactor/actions/.github/workflows/generate-readme.yml@ab#57423-v3.0-mergequeue
secrets:
token: ${{ secrets.APPROVE_README_PUSH }}

call-update-catalog-workflow:
needs: call-assign-from-json-workflow
if: needs.call-assign-from-json-workflow.outputs.update_catalog == 'true' && github.ref_name == 'main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
uses: Keyfactor/actions/.github/workflows/update-catalog.yml@v2
uses: Keyfactor/actions/.github/workflows/update-catalog.yml@v3
secrets:
token: ${{ secrets.token }}

call-repository-configuration-workflow:
if: github.event_name == 'create' && startsWith(github.ref, 'refs/heads/release-')
uses: Keyfactor/actions/.github/workflows/kf-configure-repo.yml@v2
uses: Keyfactor/actions/.github/workflows/kf-configure-repo.yml@v3
secrets:
token: ${{ secrets.token }}

#call-post-release-cleanup-workflow:
# needs: [call-dotnet-build-and-release-workflow, call-assign-from-json-workflow, call-create-github-release-workflow]
# if: needs.call-create-github-release-workflow.outputs.IS_FULL_RELEASE == 'True'
# uses: Keyfactor/actions/.github/workflows/kf-post-release.yml@v2
# uses: Keyfactor/actions/.github/workflows/kf-post-release.yml@v3
# secrets:
# token: ${{ secrets.token }}