Skip to content

Commit

Permalink
Merge branch 'WyriHaximus:3.x' into separate-helm-notes
Browse files Browse the repository at this point in the history
  • Loading branch information
theturtle32 authored Nov 22, 2024
2 parents d4d742e + e3894d9 commit 0d9421c
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 53 deletions.
10 changes: 0 additions & 10 deletions .github/dependabot.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>WyriHaximus/renovate-config:github-action"
]
}
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
REF: ${{ steps.generate-ref.outputs.ref }}
steps:
- run: helm version
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- run: helm version
- id: generate-ref
name: Generate Ref
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- "helm plugin install https://github.com/hypnoglow/helm-s3.git && helm plugin list"
- "helm env"
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- uses: ./
with:
exec: ${{ matrix.exec }}
Expand All @@ -65,7 +65,7 @@ jobs:
matrix:
runner: ${{ fromJson(needs.runner-matrix.outputs.runner) }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- run: helm version
- uses: ./
id: helm3
Expand Down Expand Up @@ -93,9 +93,9 @@ jobs:
matrix:
runner: ${{ fromJson(needs.runner-matrix.outputs.runner) }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.2.0
uses: helm/kind-action@v1.10.0
- name: Get running image ID
id: ps
run: printf "::set-output name=id::%s" $(docker ps --format "{{.ID}}")
Expand Down Expand Up @@ -181,9 +181,9 @@ jobs:
matrix:
runner: ${{ fromJson(needs.runner-matrix.outputs.runner) }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.2.0
uses: helm/kind-action@v1.10.0
- name: Get running image ID
id: ps
run: printf "::set-output name=id::%s" $(docker ps --format "{{.ID}}")
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
printf "::set-output name=cnt::%s" $(cat ~/.kube/config)
kubeconfig: ${{ steps.kubeconfig.outputs.kubeconfig }}
- name: "Assert kubeconfig really contains: junk"
uses: nick-fields/assert-action@v1
uses: nick-fields/assert-action@v2
with:
expected: junk
actual: ${{ steps.getkubeconfigcontents.outputs.cnt }}
Expand Down Expand Up @@ -289,9 +289,9 @@ jobs:
matrix:
runner: ${{ fromJson(needs.runner-matrix.outputs.runner) }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.2.0
uses: helm/kind-action@v1.10.0
- name: Get running image ID
id: ps
run: printf "::set-output name=id::%s" $(docker ps --format "{{.ID}}")
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/craft-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- generate-changelog
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Required due to the way Git works, without it this action won't be able to find any or the correct tags
- name: Create release/${{ env.MILESTONE }} branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/set-milestone-on-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
set-milestone:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
if: github.event.pull_request.milestone == null
- name: 'Get Previous tag'
if: github.event.pull_request.milestone == null
Expand Down
6 changes: 3 additions & 3 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ async function main() {
kubeConfigLocation,
"\r\n\r\n" + process.env.INPUT_KUBECONFIG + "\r\n\r\n",
{
mode: 0o644,
mode: 0o600,
}
);
} else if (kubeConfigExists) {
Expand All @@ -54,7 +54,7 @@ async function main() {
kubeConfigLocation,
"\r\n\r\n" + process.env.INPUT_KUBECONFIG + "\r\n\r\n",
{
mode: 0o644,
mode: 0o600,
}
);
}
Expand All @@ -63,7 +63,7 @@ async function main() {
dockerKubeConfig,
fs.readFileSync(kubeConfigLocation),
{
mode: 0o777,
mode: 0o600,
}
);
console.log("\033[36mPreparing helm execution\033[0m");
Expand Down
54 changes: 27 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"dependencies": {
"tmp": "^0.2.3",
"wait-file": "^1.0.5",
"wait-on": "^7.2.0"
"wait-on": "^8.0.0"
}
}

0 comments on commit 0d9421c

Please sign in to comment.