diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de62c00..9bc5d7f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,8 +70,8 @@ jobs: task build - name: test run: ./scripts/test.sh - - uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4 + - uses: codecov/codecov-action@v4 with: file: ./coverage.txt - - run: ./dotti + - run: ./dottie - run: git diff diff --git a/.gitignore b/.gitignore index 4f364b0..2b969ff 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,8 @@ dist/ bin/ coverage.txt -dotti -dotti.exe +dottie +dottie.exe .task/ .idea/ .direnv diff --git a/.goreleaser.yaml b/.goreleaser.yaml index f017884..537529b 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -96,13 +96,13 @@ changelog: dockers: - image_templates: - # - "jippi/dotti:v{{ .Version }}-amd64" - - "ghcr.io/jippi/dotti:v{{ .Version }}-amd64" + # - "jippi/dottie:v{{ .Version }}-amd64" + - "ghcr.io/jippi/dottie:v{{ .Version }}-amd64" dockerfile: Dockerfile use: buildx build_flag_templates: - "--pull" - - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/jippi/dotti/main/README.md" + - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/jippi/dottie/main/README.md" - "--label=io.artifacthub.package.logo-url=https://goreleaser.com/static/avatar.png" - '--label=io.artifacthub.package.maintainers=[{"name":"Carlos Alexandro Becker","email":"carlos@carlosbecker.dev"}]' - "--label=io.artifacthub.package.license=MIT" @@ -116,13 +116,13 @@ dockers: extra_files: - scripts/entrypoint.sh - image_templates: - - "jippi/dotti:v{{ .Version }}-arm64" - - "ghcr.io/jippi/dotti:v{{ .Version }}-arm64" + - "jippi/dottie:v{{ .Version }}-arm64" + - "ghcr.io/jippi/dottie:v{{ .Version }}-arm64" dockerfile: Dockerfile use: buildx build_flag_templates: - "--pull" - - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/jippi/dotti/main/README.md" + - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/jippi/dottie/main/README.md" - "--label=io.artifacthub.package.logo-url=https://goreleaser.com/static/avatar.png" - '--label=io.artifacthub.package.maintainers=[{"name":"Carlos Alexandro Becker","email":"carlos@carlosbecker.dev"}]' - "--label=io.artifacthub.package.license=MIT" @@ -138,30 +138,30 @@ dockers: - scripts/entrypoint.sh docker_manifests: - # - name_template: "jippi/dotti:v{{ .Version }}" + # - name_template: "jippi/dottie:v{{ .Version }}" # image_templates: - # - "jippi/dotti:v{{ .Version }}-amd64" - # - "jippi/dotti:v{{ .Version }}-arm64" - - name_template: "ghcr.io/jippi/dotti:v{{ .Version }}" + # - "jippi/dottie:v{{ .Version }}-amd64" + # - "jippi/dottie:v{{ .Version }}-arm64" + - name_template: "ghcr.io/jippi/dottie:v{{ .Version }}" image_templates: - - "ghcr.io/jippi/dotti:v{{ .Version }}-amd64" - - "ghcr.io/jippi/dotti:v{{ .Version }}-arm64" - # - name_template: "{{ if not .IsNightly }}jippi/dotti:latest{{ end }}" + - "ghcr.io/jippi/dottie:v{{ .Version }}-amd64" + - "ghcr.io/jippi/dottie:v{{ .Version }}-arm64" + # - name_template: "{{ if not .IsNightly }}jippi/dottie:latest{{ end }}" # image_templates: - # - "jippi/dotti:v{{ .Version }}-amd64" - # - "jippi/dotti:v{{ .Version }}-arm64" - - name_template: "{{ if not .IsNightly }}ghcr.io/jippi/dotti:latest{{ end }}" + # - "jippi/dottie:v{{ .Version }}-amd64" + # - "jippi/dottie:v{{ .Version }}-arm64" + - name_template: "{{ if not .IsNightly }}ghcr.io/jippi/dottie:latest{{ end }}" image_templates: - - "ghcr.io/jippi/dotti:v{{ .Version }}-amd64" - - "ghcr.io/jippi/dotti:v{{ .Version }}-arm64" - # - name_template: "{{ if .IsNightly }}jippi/dotti:nightly{{ end }}" + - "ghcr.io/jippi/dottie:v{{ .Version }}-amd64" + - "ghcr.io/jippi/dottie:v{{ .Version }}-arm64" + # - name_template: "{{ if .IsNightly }}jippi/dottie:nightly{{ end }}" # image_templates: - # - "jippi/dotti:v{{ .Version }}-amd64" - # - "jippi/dotti:v{{ .Version }}-arm64" - - name_template: "{{ if .IsNightly }}ghcr.io/jippi/dotti:nightly{{ end }}" + # - "jippi/dottie:v{{ .Version }}-amd64" + # - "jippi/dottie:v{{ .Version }}-arm64" + - name_template: "{{ if .IsNightly }}ghcr.io/jippi/dottie:nightly{{ end }}" image_templates: - - "ghcr.io/jippi/dotti:v{{ .Version }}-amd64" - - "ghcr.io/jippi/dotti:v{{ .Version }}-arm64" + - "ghcr.io/jippi/dottie:v{{ .Version }}-amd64" + - "ghcr.io/jippi/dottie:v{{ .Version }}-arm64" archives: - name_template: >- @@ -186,24 +186,24 @@ archives: brews: - repository: owner: jippi - name: dotti-homebrew-tap + name: dottie-homebrew-tap folder: Formula goarm: "7" - homepage: https://github.com/jippi/dotti + homepage: https://github.com/jippi/dottie description: Hello World license: MIT test: | - system "#{bin}/dotti -v" + system "#{bin}/dottie -v" dependencies: - name: go type: optional - name: git type: optional extra_install: |- - bash_completion.install "completions/dotti.bash" => "goreleaser" - zsh_completion.install "completions/dotti.zsh" => "_goreleaser" - fish_completion.install "completions/dotti.fish" - man1.install "manpages/dotti.1.gz" + bash_completion.install "completions/dottie.bash" => "goreleaser" + zsh_completion.install "completions/dottie.zsh" => "_goreleaser" + fish_completion.install "completions/dottie.fish" + man1.install "manpages/dottie.1.gz" # nix: # - name: goreleaser @@ -219,10 +219,10 @@ brews: # installShellCompletion ./completions/* # winget: -# - name: dotti +# - name: dottie # publisher: jippi # license: MIT -# homepage: https://github.com/jippi/dotti +# homepage: https://github.com/jippi/dottie # short_description: Hello World # repository: # owner: goreleaser @@ -237,10 +237,10 @@ brews: # branch: master # aurs: -# - homepage: https://github.com/jippi/dotti +# - homepage: https://github.com/jippi/dottie # description: Hello World # maintainers: -# - "Christian Winther " +# - "Christian Winther " # license: MIT # private_key: "{{ .Env.AUR_KEY }}" # git_url: "ssh://aur@aur.archlinux.org/goreleaser-bin.git" @@ -265,42 +265,42 @@ brews: # scoops: # - repository: # owner: jippi -# name: dotti-scoop +# name: dottie-scoop # folder: bucket -# homepage: https://github.com/jippi/dotti +# homepage: https://github.com/jippi/dottie # description: Hello world # license: MIT nfpms: - file_name_template: "{{ .ConventionalFileName }}" id: packages - homepage: https://github.com/jippi/dotti + homepage: https://github.com/jippi/dottie description: |- Hello World - maintainer: Christian Winther + maintainer: Christian Winther license: MIT - vendor: Dotti + vendor: dottie bindir: /usr/bin section: utils contents: - - src: ./completions/dotti.bash - dst: /usr/share/bash-completion/completions/dotti + - src: ./completions/dottie.bash + dst: /usr/share/bash-completion/completions/dottie file_info: mode: 0644 - - src: ./completions/dotti.fish - dst: /usr/share/fish/vendor_completions.d/dotti.fish + - src: ./completions/dottie.fish + dst: /usr/share/fish/vendor_completions.d/dottie.fish file_info: mode: 0644 - - src: ./completions/dotti.zsh - dst: /usr/share/zsh/vendor-completions/_dotti + - src: ./completions/dottie.zsh + dst: /usr/share/zsh/vendor-completions/_dottie file_info: mode: 0644 - - src: ./manpages/dotti.1.gz - dst: /usr/share/man/man1/dotti.1.gz + - src: ./manpages/dottie.1.gz + dst: /usr/share/man/man1/dottie.1.gz file_info: mode: 0644 - src: ./LICENSE.md - dst: /usr/share/doc/dotti/copyright + dst: /usr/share/doc/dottie/copyright file_info: mode: 0644 formats: @@ -357,4 +357,4 @@ milestones: release: name_template: "v{{ .Version }}" footer: | - **Full Changelog**: https://github.com/jippi/dotti/compare/{{ .PreviousTag }}...{{ if .IsNightly }}nightly{{ else }}{{ .Tag }}{{ end }} + **Full Changelog**: https://github.com/jippi/dottie/compare/{{ .PreviousTag }}...{{ if .IsNightly }}nightly{{ else }}{{ .Tag }}{{ end }} diff --git a/Taskfile.yml b/Taskfile.yml index 40c67ba..0a79783 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -22,9 +22,9 @@ tasks: sources: - ./**/*.go generates: - - ./dotti + - ./dottie cmds: - - go build -o dotti ./cmd/ + - go build -o dottie ./cmd/ test: desc: Run tests @@ -74,87 +74,87 @@ tasks: - echo {{.NEXT}} - git push origin --tags - dotti:test:pkg: + dottie:test:pkg: desc: Test a package cmds: - docker run --platform linux/{{ .Platform }} --rm --workdir /tmp -v $PWD/dist:/tmp {{ .Image }} sh -c '{{ .Cmd }} && goreleaser --version' - dotti:test:rpm: + dottie:test:rpm: desc: Tests rpm packages vars: rpm: "rpm --nodeps -ivh" cmds: - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "386" Image: centos:centos7 Cmd: "{{.rpm}} goreleaser-*.i386.rpm" - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "amd64" Image: fedora Cmd: "{{.rpm}} goreleaser-*.x86_64.rpm" - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "arm64" Image: fedora Cmd: "{{.rpm}} goreleaser-*.aarch64.rpm" - dotti:test:deb: + dottie:test:deb: desc: Tests deb packages vars: dpkg: "dpkg --ignore-depends=git -i" cmds: - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "amd64" Image: ubuntu Cmd: "{{.dpkg}} goreleaser*_amd64.deb" - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "arm64" Image: ubuntu Cmd: "{{.dpkg}} goreleaser*_arm64.deb" - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "arm/7" Image: ubuntu Cmd: "{{.dpkg}} goreleaser*_armhf.deb" - dotti:test:apk: + dottie:test:apk: desc: Tests apk packages vars: apk: "apk add --allow-untrusted -U" cmds: - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "386" Image: alpine Cmd: "{{.apk}} goreleaser*_x86.apk" - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "amd64" Image: alpine Cmd: "{{.apk}} goreleaser*_x86_64.apk" - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "arm64" Image: alpine Cmd: "{{.apk}} goreleaser*_aarch64.apk" - - task: dotti:test:pkg + - task: dottie:test:pkg vars: Platform: "arm/7" Image: alpine Cmd: "{{.apk}} goreleaser*_armv7.apk" - dotti:test: + dottie:test: desc: Test built linux packages cmds: - - task: dotti:test:apk - - task: dotti:test:deb - - task: dotti:test:rpm + - task: dottie:test:apk + - task: dottie:test:deb + - task: dottie:test:rpm - dotti: + dottie: desc: Run GoReleaser either in snapshot or release mode deps: - build diff --git a/scripts/completions.sh b/scripts/completions.sh index ba8d4c3..29008fc 100644 --- a/scripts/completions.sh +++ b/scripts/completions.sh @@ -5,5 +5,5 @@ rm -rf completions mkdir completions for sh in bash fish ps zsh; do - go run ./cmd/ completion "$sh" >"completions/dotti.$sh" + go run ./cmd/ completion "$sh" >"completions/dottie.$sh" done diff --git a/scripts/manpages.sh b/scripts/manpages.sh index 93f5980..8261ef7 100644 --- a/scripts/manpages.sh +++ b/scripts/manpages.sh @@ -4,4 +4,4 @@ set -e rm -rf manpages mkdir manpages -go run ./cmd | gzip -c -9 >manpages/dotti.1.gz +go run ./cmd | gzip -c -9 >manpages/dottie.1.gz