Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/dot-github/actio…
Browse files Browse the repository at this point in the history
…ns/setup-kind/catch-all-cba3cefdba
  • Loading branch information
gionn authored Jan 7, 2025
2 parents 041b0f2 + 366831f commit c6644b1
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 98 deletions.
79 changes: 0 additions & 79 deletions .github/actions/dispatch-resume-workflow/action.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish-artifacts-for-veracode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
${{ runner.os }}-maven-
- name: Set up JDK 21
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
with:
java-version: '21'
distribution: 'temurin'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/terraform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ jobs:
fi
- name: Terraform validate
uses: dflook/terraform-validate@93108d6d37b2fd79d527ec77c190105de1429bb5 # v1.44.0
uses: dflook/terraform-validate@46e4736fe16f84ba22a09c6c4d4a7bd5bb5f978e # v1.45.0
with:
path: ${{ inputs.terraform_root_path }}
backend_config: |
bucket=${{ vars.TERRAFORM_STATE_BUCKET }}
key=${{ vars.RESOURCE_NAME }}/${{ inputs.terraform_root_path }}/terraform.tfstate
- name: Terraform plan
uses: dflook/terraform-plan@b0877a1bf56160160ab482f4aff8a12fff35fe06 # v1.44.0
uses: dflook/terraform-plan@ce9a5c5ab9fe6383d3daaa46c5dc25bce2c5fda8 # v1.45.0
if: github.event_name == 'pull_request'
with:
label: ${{ vars.RESOURCE_NAME }} ${{ inputs.terraform_root_path }}
Expand All @@ -131,7 +131,7 @@ jobs:
key=${{ vars.RESOURCE_NAME }}/${{ inputs.terraform_root_path }}/terraform.tfstate
- name: Terraform apply
uses: dflook/terraform-apply@7d435d4d115a11e5db1e710ac969f5382f0f6f9f # v1.44.0
uses: dflook/terraform-apply@8ffcf535ca17dd84586bcda5b072f3d7bde0a97c # v1.45.0
if: github.event_name == 'push' || inputs.terraform_operation == 'apply' || (github.event_name == 'issue_comment' && contains(github.event.comment.body, 'terraform apply'))
with:
label: ${{ vars.RESOURCE_NAME }} ${{ inputs.terraform_root_path }}
Expand All @@ -145,7 +145,7 @@ jobs:
key=${{ vars.RESOURCE_NAME }}/${{ inputs.terraform_root_path }}/terraform.tfstate
- name: Terraform destroy
uses: dflook/terraform-destroy@2e74fdc282c2980b12503986b2d8483d7cbfa14a # v1.44.0
uses: dflook/terraform-destroy@e041432f30e228bf5d24bf6072202dc121e68f29 # v1.45.0
if: inputs.terraform_operation == 'destroy'
with:
path: ${{ inputs.terraform_root_path }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: pre-commit checks
uses: ./.github/actions/pre-commit
- name: Ensure SHA pinned actions
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@64418826697dcd77c93a8e4a1f7601a1942e57b5 # v3.0.18
uses: zgosalvez/github-actions-ensure-sha-pinned-actions@6ae615f6475d2ede5ad88bea6baa7a1d5e93ffaa # v3.0.19
with:
allowlist: |
Alfresco/alfresco-build-tools/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/updatecli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
file: ${{fromJson(needs.build-matrix-github-releases.outputs.matrix)}}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: updatecli/updatecli-action@11d8c3e7c4dbb188d9534e599db759e418911828 # v2.73.0
- uses: updatecli/updatecli-action@4aca518a70708e38063453d8de9c551af7f48ac3 # v2.75.0

- name: Run Updatecli
run: updatecli apply -c .updatecli/templates/github_releases.yaml -v .updatecli/values/github_releases/${{ matrix.file }}
Expand Down
24 changes: 12 additions & 12 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Here follows the list of GitHub Actions topics available in the current document
- [calculate-next-internal-version](#calculate-next-internal-version)
- [configure-git-author](#configure-git-author)
- [dbp-charts](#dbp-charts)
- [dispatch-resume-workflow](#dispatch-resume-workflow)
- [docker-build-image](#docker-build-image)
- [docker-dump-containers-logs](#docker-dump-containers-logs)
- [docker-scan-image-dirs](#docker-scan-image-dirs)
Expand Down Expand Up @@ -104,7 +105,6 @@ Here follows the list of GitHub Actions topics available in the current document
- [update-project-base-tag](#update-project-base-tag)
- [validate-maven-versions](#validate-maven-versions)
- [veracode](#veracode)
- [dispatch-resume-workflow](#dispatch-resume-workflow)
- [Reusable workflows provided by us](#reusable-workflows-provided-by-us)
- [helm-publish-new-package-version.yml](#helm-publish-new-package-versionyml)
- [terraform](#terraform)
Expand Down Expand Up @@ -425,6 +425,17 @@ A collection of actions used in Alfresco acs-deployment repository to manage Hel

See [dbp-charts](../.github/actions/dbp-charts/) for more details.

### dispatch-resume-workflow

Ability to dispatch or resume an existing workflow and wait for its completion.

```yaml
- uses: Alfresco/alfresco-build-tools/.github/actions/dispatch-resume-workflow@ref
with:
workflow: workflow-name.yml
run-id: existing_run_number (optional)
```

### docker-build-image

Build docker image based on supplied jar files. It replaces `image-dir` and `image-tag` in the
Expand Down Expand Up @@ -1692,17 +1703,6 @@ entry `release.baseTag.$PROJECT` with the value specified in the input `tag`.
tag: ${{ env.ALPHA_VERSION }}
```

### dispatch-resume-workflow

Ability to dispatch or resume an existing workflow and wait for its completition

```yaml
- uses: Alfresco/alfresco-build-tools/.github/actions/dispatch-resume-workflow@ref
with:
workflow: workflow-name.yml
run-id: existing_run_number (optional)
```

### validate-maven-versions

Validates Maven dependency graph versions to ensure all target includes artifacts versions align
Expand Down

0 comments on commit c6644b1

Please sign in to comment.