diff --git a/.gitea/workflows/changelog.yml b/.gitea/workflows/changelog.yml index 585c117..f53ee3b 100644 --- a/.gitea/workflows/changelog.yml +++ b/.gitea/workflows/changelog.yml @@ -8,12 +8,12 @@ on: jobs: changelog: runs-on: ubuntu-latest - container: docker.io/thegeeklab/git-sv:1.0.12 + container: docker.io/thegeeklab/git-sv:2.0.5 steps: - name: install tools run: | apk add -q --update --no-cache nodejs curl jq sed - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - name: Generate upcoming changelog diff --git a/.gitea/workflows/commitlint.yml b/.gitea/workflows/commitlint.yml index b52cc38..ab788a9 100644 --- a/.gitea/workflows/commitlint.yml +++ b/.gitea/workflows/commitlint.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest container: commitlint/commitlint:19.7.1 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: check PR title run: | echo "${{ gitea.event.pull_request.title }}" | commitlint --config .commitlintrc.json diff --git a/.gitea/workflows/release-version.yml b/.gitea/workflows/release-version.yml index 974c5c0..4a32907 100644 --- a/.gitea/workflows/release-version.yml +++ b/.gitea/workflows/release-version.yml @@ -13,7 +13,7 @@ jobs: generate-chart-publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: install tools run: | apt update -y @@ -59,7 +59,7 @@ jobs: helm registry logout registry-1.docker.io - name: aws credential configure - uses: https://github.com/aws-actions/configure-aws-credentials@v4 + uses: https://github.com/aws-actions/configure-aws-credentials@v5 with: aws-access-key-id: ${{ secrets.AWS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.gitea/workflows/shellcheck.yml b/.gitea/workflows/shellcheck.yml index 592c555..a9a2348 100644 --- a/.gitea/workflows/shellcheck.yml +++ b/.gitea/workflows/shellcheck.yml @@ -9,6 +9,6 @@ jobs: shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.2.2 + - uses: actions/checkout@v5 - run: apt update --yes && apt install --yes shellcheck - run: find . -type f -name "*.sh" -exec shellcheck -a {} \; diff --git a/.gitea/workflows/test-pr.yml b/.gitea/workflows/test-pr.yml index c1d6f7f..5c7735f 100644 --- a/.gitea/workflows/test-pr.yml +++ b/.gitea/workflows/test-pr.yml @@ -25,7 +25,7 @@ jobs: uses: pnpm/action-setup@v4 with: version: 10 - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: install chart dependencies run: helm dependency build - name: lint diff --git a/README.md b/README.md index 0f75d49..bd44fb9 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ If `.Values.image.rootless: true`, then the following will occur. In case you us | `statefulset.affinity` | Affinity for the statefulset | `{}` | | `statefulset.extraVolumes` | Extra volumes for the statefulset | `[]` | | `statefulset.actRunner.repository` | The Gitea act runner image | `gitea/act_runner` | -| `statefulset.actRunner.tag` | The Gitea act runner tag | `0.2.12` | +| `statefulset.actRunner.tag` | The Gitea act runner tag | `0.2.13` | | `statefulset.actRunner.pullPolicy` | The Gitea act runner pullPolicy | `IfNotPresent` | | `statefulset.actRunner.extraVolumeMounts` | Allows mounting extra volumes in the act runner container | `[]` | | `statefulset.actRunner.config` | Act runner custom configuration. See [Act Runner documentation](https://docs.gitea.com/usage/actions/act-runner#configuration) for details. | `Too complex. See values.yaml` | diff --git a/renovate.json5 b/renovate.json5 index b07d373..cc47df6 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -9,19 +9,19 @@ labels: [ 'kind/dependency', ], - "digest": { - "automerge": true + digest: { + automerge: true, }, automergeStrategy: 'squash', 'git-submodules': { - 'enabled': true + enabled: true, }, customManagers: [ { description: 'Gitea-version of https://docs.renovatebot.com/presets-regexManagers/#regexmanagersgithubactionsversions', customType: 'regex', - fileMatch: [ - '.gitea/workflows/.+\\.ya?ml$', + managerFilePatterns: [ + '/.gitea/workflows/.+\\.ya?ml$/', ], matchStrings: [ '# renovate: datasource=(?[a-z-.]+?) depName=(?[^\\s]+?)(?: (?:lookupName|packageName)=(?[^\\s]+?))?(?: versioning=(?[a-z-0-9]+?))?\\s+[A-Za-z0-9_]+?_VERSION\\s*:\\s*["\']?(?.+?)["\']?\\s', @@ -30,7 +30,9 @@ { description: 'Detect helm-unittest yaml schema file', customType: 'regex', - fileMatch: ['.vscode/settings\\.json$'], + managerFilePatterns: [ + '/.vscode/settings\\.json$/', + ], matchStrings: [ 'https:\\/\\/raw\\.githubusercontent\\.com\\/(?[^\\s]+?)\\/(?v[0-9.]+?)\\/schema\\/helm-testsuite\\.json', ], diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml index d50d838..c190c50 100644 --- a/templates/statefulset.yaml +++ b/templates/statefulset.yaml @@ -48,20 +48,6 @@ spec: image: "{{ .Values.statefulset.actRunner.repository }}:{{ .Values.statefulset.actRunner.tag }}" imagePullPolicy: {{ .Values.statefulset.actRunner.pullPolicy }} workingDir: /data - command: - # The following is a workaround for: https://gitea.com/gitea/act_runner/issues/731 - # We must add the docker-cli package for the server AND client cert verification. - - sh - - -c - - | - apk add --no-cache docker-cli - echo "Waiting for Docker daemon..." - until timeout 10 docker info > /dev/null; do - echo "Failed, retrying..." - sleep 2 - done - echo "Docker is ready, starting act-runner..." - exec run.sh env: - name: DOCKER_HOST value: tcp://127.0.0.1:2376 diff --git a/unittests/helm/statefulset.yaml b/unittests/helm/statefulset.yaml index c6309fb..70c38a9 100644 --- a/unittests/helm/statefulset.yaml +++ b/unittests/helm/statefulset.yaml @@ -69,7 +69,7 @@ tests: name: gitea-unittests-actions-act-runner - equal: path: spec.template.metadata.annotations["checksum/config"] - value: "7566d9c60261bf8cbff6a6936fc7aead96cec540d8c793d142a5ad4664c56ba5" + value: "2bafbf04b3c4293c8ddf895ae3d908e14176ee54a6c724c8cf5b2a1e43c6ece7" - it: renders a StatefulSet http (with correct GITEA_INSTANCE_URL env from giteaRootURL) template: templates/statefulset.yaml set: diff --git a/values.yaml b/values.yaml index 6416b8d..b07dafd 100644 --- a/values.yaml +++ b/values.yaml @@ -41,7 +41,7 @@ statefulset: actRunner: repository: gitea/act_runner - tag: 0.2.12 + tag: 0.2.13 pullPolicy: IfNotPresent extraVolumeMounts: [] @@ -51,6 +51,9 @@ statefulset: level: debug cache: enabled: false + container: + require_docker: true + docker_timeout: 300s dind: repository: docker