Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
olivere committed Nov 21, 2023
2 parents a6965f8 + d5de97a commit b1e6da6
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
name: Release

on:
pull_request:
push:
tags:
- '*'

jobs:
goreleaser:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
on: [push, pull_request]

name: Test

jobs:
test:
strategy:
Expand All @@ -13,7 +15,9 @@ jobs:
uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go-version }}

- name: Checkout
uses: actions/checkout@v4

- name: Test
run: go test -race -v ./...
5 changes: 5 additions & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
# Make sure to check the documentation at http://goreleaser.com
env:
- CGO_ENABLED=0

before:
hooks:
# you may remove this if you don't use vgo
- go mod tidy

builds:
- id: imgls
main: ./cmd/imgls
Expand Down Expand Up @@ -37,13 +39,16 @@ builds:
ignore:
- goos: darwin
goarch: 386

checksum:
name_template: '{{ .ProjectName }}_checksums.txt'

archives:
- name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
format_overrides:
- goos: windows
format: zip

changelog:
sort: asc
filters:
Expand Down

0 comments on commit b1e6da6

Please sign in to comment.