diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml index a3f56e38..78cb816f 100644 --- a/.github/workflows/updatecli.yaml +++ b/.github/workflows/updatecli.yaml @@ -16,7 +16,7 @@ jobs: - name: "Setup updatecli" uses: "updatecli/updatecli-action@5ca36367fadc6ad94d590984fd9c696e783ec635" # v2.96.0 with: - version: "v0.113.0-rc.1" + version: "v0.113.0" - name: "Run updatecli" run: updatecli compose apply --clean-git-branches=true --experimental diff --git a/.github/workflows/updatecli_test.yaml b/.github/workflows/updatecli_test.yaml index 4f6806a8..7f1aed9d 100644 --- a/.github/workflows/updatecli_test.yaml +++ b/.github/workflows/updatecli_test.yaml @@ -16,11 +16,11 @@ jobs: - name: "Setup updatecli" uses: "updatecli/updatecli-action@5ca36367fadc6ad94d590984fd9c696e783ec635" # v2.96.0 with: - version: "v0.113.0-rc.1" + version: "v0.113.0" - name: "Test updatecli in dry-run mode" run: "updatecli compose diff" env: # This step is executed in untrusted context. We use a GitHub token with minimal permissions. - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + UPDATECLI_GITHUB_USERNAME: ${{ github.actor }} + UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/updatecli_update.yaml b/.github/workflows/updatecli_update.yaml index 3aaaae95..28a539d8 100644 --- a/.github/workflows/updatecli_update.yaml +++ b/.github/workflows/updatecli_update.yaml @@ -15,7 +15,7 @@ jobs: - name: "Setup updatecli" uses: "updatecli/updatecli-action@5ca36367fadc6ad94d590984fd9c696e783ec635" # v2.96.0 with: - version: "v0.113.0-rc.1" + version: "v0.113.0" - name: "Run updatecli only on existing pipelines" run: updatecli compose apply --clean-git-branches=true --existing-only=true --experimental diff --git a/updatecli/updatecli.d/updatecli.yaml b/updatecli/updatecli.d/updatecli.yaml index 09c6ca03..4ef9f281 100644 --- a/updatecli/updatecli.d/updatecli.yaml +++ b/updatecli/updatecli.d/updatecli.yaml @@ -1,81 +1,78 @@ name: "deps: bump updatecli version" pipelineid: "updatecli_action_version" actions: - default: - kind: "github/pullrequest" - spec: - title: 'deps: update updatecli version to {{ source "updatecli" }}' - automerge: true - mergemethod: "squash" - usetitleforautomerge: true - reviewers: - - "updatecli/core" - labels: - - "dependencies" - - "updatecli" - scmid: "default" + default: + kind: "github/pullrequest" + spec: + title: 'deps: update updatecli version to {{ source "updatecli" }}' + automerge: true + mergemethod: "squash" + usetitleforautomerge: true + reviewers: + - "updatecli/core" + labels: + - "dependencies" + - "updatecli" + scmid: "default" scms: - default: - kind: "github" - spec: - branch: '{{ .scm.branch }}' - email: ' {{ .scm.email }}' - owner: '{{ .scm.owner }}' - repository: '{{ .scm.repository }}' - token: '{{requiredEnv "GITHUB_TOKEN"}}' - user: '{{ .scm.user }}' - username: '{{ .scm.username }}' - commitusingapi: true - disabled: false + default: + kind: "github" + spec: + branch: "{{ .scm.branch }}" + email: " {{ .scm.email }}" + owner: "{{ .scm.owner }}" + repository: "{{ .scm.repository }}" + user: "{{ .scm.user }}" + commitusingapi: true + disabled: false sources: - updatecli: - name: "Get latest updatecli version" - kind: "githubrelease" - spec: - owner: "updatecli" - repository: "updatecli" - token: '{{requiredEnv "GITHUB_TOKEN"}}' - versionfilter: - kind: "semver" + updatecli: + name: "Get latest updatecli version" + kind: "githubrelease" + spec: + owner: "updatecli" + repository: "updatecli" + versionfilter: + kind: "semver" targets: - src-main: - name: 'deps: bump updatecli version in src/main.js to {{ source "updatecli" }}' - kind: "file" - spec: - file: "src/main.js" - matchpattern: 'const DEFAULT_VERSION = (.+)' - replacepattern: 'const DEFAULT_VERSION = `{{ source "updatecli" }}`' - scmid: "default" - sourceid: "updatecli" + src-main: + name: 'deps: bump updatecli version in src/main.js to {{ source "updatecli" }}' + kind: "file" + spec: + file: "src/main.js" + matchpattern: "const DEFAULT_VERSION = (.+)" + replacepattern: 'const DEFAULT_VERSION = `{{ source "updatecli" }}`' + scmid: "default" + sourceid: "updatecli" - test-main: - name: 'deps: bump updatecli version in tests/main.test.js to {{ source "updatecli" }}' - kind: "file" - spec: - file: "tests/main.test.js" - matchpattern: "const DEFAULT_VERSION = (.+)" - replacepattern: 'const DEFAULT_VERSION = `{{ source "updatecli" }}`' - scmid: "default" - sourceid: "updatecli" + test-main: + name: 'deps: bump updatecli version in tests/main.test.js to {{ source "updatecli" }}' + kind: "file" + spec: + file: "tests/main.test.js" + matchpattern: "const DEFAULT_VERSION = (.+)" + replacepattern: 'const DEFAULT_VERSION = `{{ source "updatecli" }}`' + scmid: "default" + sourceid: "updatecli" - dist: - name: 'chore: rebuild the dist directory' - dependson: - - "src-main" - - "test-main" - disablesourceinput: true - kind: shell - scmid: "default" + dist: + name: "chore: rebuild the dist directory" + dependson: + - "src-main" + - "test-main" + disablesourceinput: true + kind: shell + scmid: "default" + spec: + command: | + npm ci + npm run prepare + changedif: + kind: file/checksum spec: - command: | - npm ci - npm run prepare - changedif: - kind: file/checksum - spec: - files: - - "dist/index.js" - - "dist/index.js.map" - environments: - - name: "PATH" - - name: "HOME" + files: + - "dist/index.js" + - "dist/index.js.map" + environments: + - name: "PATH" + - name: "HOME" diff --git a/updatecli/values.d/scm.yaml b/updatecli/values.d/scm.yaml index 1555ac63..45f86907 100644 --- a/updatecli/values.d/scm.yaml +++ b/updatecli/values.d/scm.yaml @@ -1,8 +1,7 @@ scm: enabled: true - user: updatecli - email: updatecli-bot@updatecli.io + user: updateclibot + email: bot@updatecli.io owner: updatecli - repository: updatecli-action - username: "updatecli" branch: v2 + repository: updatecli-action