Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/devops-actions/act…
Browse files Browse the repository at this point in the history
…ion-get-tag-6167776d96bd5da05da534aa9cea6d7c786c1c5a
  • Loading branch information
rajbos authored Jul 4, 2024
2 parents b466e4e + ef45928 commit c0574b3
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 25 deletions.
10 changes: 0 additions & 10 deletions .github/pull_request_template.md

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/approve-dependabot-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Approve Dependabot PR's"
on:
pull_request:

permissions:
contents: read

jobs:
dependabot:
permissions:
contents: write
pull-requests: write
actions: write
uses: devops-actions/.github/.github/workflows/approve-dependabot-pr.yml@main
secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java, ruby

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below).
- name: Autobuild
uses: github/codeql-action/autobuild@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -55,4 +55,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
4 changes: 2 additions & 2 deletions .github/workflows/publishing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
test-local-action:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- uses: ./
name: Load used actions
Expand All @@ -36,7 +36,7 @@ jobs:
}
- name: Upload result file as artefact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: actions
path: actions.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semver-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
semver:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
with:
fetch-depth: 0 # needed to get all tags

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
name: Run Pester tests
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Execute tests
shell: pwsh
Expand All @@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest
name: Test on current organization
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- uses: ./
name: Load used actions
Expand All @@ -64,7 +64,7 @@ jobs:
}
- name: Upload result file as artefact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: actions-${{ env.GITHUB_REPOSITORY_OWNER }}
path: |
Expand All @@ -77,7 +77,7 @@ jobs:
env:
organization: rajbos-actions-demo
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- uses: ./
name: Load used actions
Expand All @@ -103,7 +103,7 @@ jobs:
}
- name: Upload result file as artefact
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
with:
name: actions-${{ env.organization }}
path: |
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Used for inserting data into the [internal actions marketplace](https://github.c
Minimal uses expression to use this action:

``` yaml
uses: devops-actions/github-action-[email protected]
uses: devops-actions/[email protected]
with:
PAT: ${{ secrets.GITHUB_TOKEN }} # use an Access Token with correct permissions to view private repos if you need to
```
Expand All @@ -33,7 +33,7 @@ jobs:
load-all-used-actions:
runs-on: ubuntu-latest
steps:
- uses: devops-actions/github-action-[email protected]
- uses: devops-actions/[email protected]
name: Load used actions
id: load-actions
with:
Expand All @@ -47,7 +47,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: actions-file
path: actions.json
path: ${{ steps.load-actions.outputs.actions-file }}
```

## Inputs
Expand Down

0 comments on commit c0574b3

Please sign in to comment.