Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.2.1 #211

Merged
merged 38 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f6fdc51
Don't wait for fedora builds to finish
dvdmuckle Jan 28, 2024
8bc543d
Merge pull request #188 from dvdmuckle/nowait-fedora-builds
dvdmuckle Jan 28, 2024
9f3911a
Automatically bump homebrew formula on release
dvdmuckle Feb 2, 2024
2ffd594
Merge pull request #189 from dvdmuckle/auto-bump-homebrew
dvdmuckle Feb 2, 2024
6bb76bb
Bump golang.org/x/oauth2 from 0.16.0 to 0.17.0
dependabot[bot] Feb 9, 2024
7b4d6dd
Merge pull request #190 from dvdmuckle/dependabot/go_modules/golang.o…
dvdmuckle Feb 10, 2024
9acd12a
Use different machine types for Go build, fix typos
dvdmuckle Feb 19, 2024
17c195b
Merge pull request #191 from dvdmuckle/go-release-build-new-machine-t…
dvdmuckle Feb 19, 2024
9b879c7
Bump golang.org/x/oauth2 from 0.17.0 to 0.18.0
dependabot[bot] Mar 5, 2024
f04af4b
Bump google.golang.org/protobuf from 1.31.0 to 1.33.0
dependabot[bot] Mar 13, 2024
8cf0e9b
Merge pull request #193 from dvdmuckle/dependabot/go_modules/google.g…
dvdmuckle Mar 16, 2024
b080fd5
Merge pull request #192 from dvdmuckle/dependabot/go_modules/golang.o…
dvdmuckle Mar 16, 2024
2a27180
Bump github.com/zalando/go-keyring from 0.2.3 to 0.2.4
dependabot[bot] Mar 18, 2024
fcb815e
Merge pull request #194 from dvdmuckle:dependabot/go_modules/github.c…
dvdmuckle Apr 3, 2024
2304dae
Bump github.com/golang/glog from 1.2.0 to 1.2.1
dependabot[bot] Apr 5, 2024
7cf1238
Bump golang.org/x/net from 0.22.0 to 0.23.0
dependabot[bot] Apr 19, 2024
2f1287e
Merge pull request #197 from dvdmuckle/dependabot/go_modules/golang.o…
dvdmuckle Apr 24, 2024
9a262cb
Bump github.com/zmb3/spotify/v2 from 2.4.1 to 2.4.2
dependabot[bot] Apr 24, 2024
f77759d
Correct var type in seek
dvdmuckle Apr 24, 2024
82cf884
Merge pull request #198 from dvdmuckle/dependabot/go_modules/github.c…
dvdmuckle Apr 24, 2024
bd2f677
Bump golang.org/x/oauth2 from 0.18.0 to 0.19.0
dependabot[bot] Apr 24, 2024
f01e784
Merge pull request #196 from dvdmuckle/dependabot/go_modules/github.c…
dvdmuckle Apr 24, 2024
c913d8e
Merge pull request #195 from dvdmuckle/dependabot/go_modules/golang.o…
dvdmuckle Apr 24, 2024
47728b2
Bump golang.org/x/oauth2 from 0.19.0 to 0.20.0
dependabot[bot] May 6, 2024
dc899ee
Merge pull request #199 from dvdmuckle/dependabot/go_modules/golang.o…
dvdmuckle May 8, 2024
bd67ff8
Bump github.com/zalando/go-keyring from 0.2.4 to 0.2.5
dependabot[bot] Jun 7, 2024
7189625
Merge pull request #202 from dvdmuckle/dependabot/go_modules/github.c…
dvdmuckle Jun 16, 2024
f8804ae
Bump golang.org/x/oauth2 from 0.20.0 to 0.21.0
dependabot[bot] Jun 16, 2024
ae76335
Merge pull request #201 from dvdmuckle/dependabot/go_modules/golang.o…
dvdmuckle Jun 17, 2024
cf62197
Bump github.com/spf13/viper from 1.18.2 to 1.19.0
dependabot[bot] Jun 17, 2024
f6cd2c9
Merge pull request #200 from dvdmuckle/dependabot/go_modules/github.c…
dvdmuckle Jun 17, 2024
6f30cff
Bump github.com/spf13/cobra from 1.8.0 to 1.8.1
dependabot[bot] Jun 17, 2024
e609a51
Merge pull request #203 from dvdmuckle/dependabot/go_modules/github.c…
dvdmuckle Jun 17, 2024
d235a9b
Update specs
dvdmuckle Jul 4, 2024
996b631
Bump version of codeql workflow
dvdmuckle Jul 4, 2024
afede60
Also check for new GHA
dvdmuckle Jul 4, 2024
2716f3f
Merge pull request #205 from dvdmuckle/codeql-bump-version
dvdmuckle Jul 4, 2024
8663abc
Merge pull request #204 from dvdmuckle/1.2.1-update-specs
dvdmuckle Jul 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ updates:
interval: daily
time: '10:00'
open-pull-requests-limit: 10
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
23 changes: 22 additions & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
name: Build Release
on:
release:
types:
Expand All @@ -10,26 +11,34 @@ permissions:
jobs:
build:
name: release ${{ matrix.goos }}/${{ matrix.goarch }}
runs-on: ubuntu-latest
runs-on: ${{ matrix.machine }}
strategy:
matrix:
include:
- goos: linux
goarch: 386
machine: ubuntu-latest
- goos: linux
goarch: amd64
machine: ubuntu-latest
- goos: linux
goarch: arm
machine: ubuntu-latest
- goos: linux
goarch: arm64
machine: ubuntu-latest
- goos: darwin
goarch: amd64
machine: macos-latest
- goos: darwin
goarch: arm64
machine: macos-14
- goos: windows
goarch: 386
machine: ubuntu-latest
- goos: windows
goarch: amd64
machine: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: compile and release
Expand All @@ -40,3 +49,15 @@ jobs:
goos: ${{ matrix.goos }}
extra_files: "LICENSE"
ldflags: "-X github.com/dvdmuckle/spc/cmd.version=${{ github.event.release.tag_name }}"
homebrew:
name: Bump Homebrew formula
runs-on: ubuntu-latest
steps:
- uses: mislav/bump-homebrew-formula-action@v3
with:
formula-name: spc
create-pullrequest: true
homebrew-tap: dvdmuckle/homebrew-tap
tag-name: ${{ github.event.release.tag_name }}
env:
COMITTER_TOKEN: ${{ secrets.HOMEBREW_BUMP }}
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/fedora-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
dnf -y install copr-cli

- name: Submit the build by uploading the spec
run: copr build dvdmuckle/spc spc.spec
run: copr build --nowait dvdmuckle/spc spc.spec
11 changes: 6 additions & 5 deletions cmd/seek.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -36,7 +36,7 @@ exactly one argument, either a number between 0 and the length of the song in se
the form of minutes:seconds.`,
Run: func(cmd *cobra.Command, args []string) {
helper.SetClient(&conf)
var position int
var position spotify.Numeric
if strings.Contains(args[0], ":") {
var (
minutes int
Expand All @@ -47,14 +47,15 @@ the form of minutes:seconds.`,
fmt.Println("Timestamp must be numbers in the form of minutes:seconds")
os.Exit(1)
}
position = minutes*60 + seconds
position = spotify.Numeric(minutes*60 + seconds)
} else {
var err error
position, err = strconv.Atoi(args[0])
tmp, err := strconv.Atoi(args[0])
if err != nil {
fmt.Println("Passed value for seconds must be an integer.")
os.Exit(1)
}
position = spotify.Numeric(tmp)
}

ctx := context.Background()
Expand All @@ -76,7 +77,7 @@ the form of minutes:seconds.`,
os.Exit(1)
}

err = conf.Client.SeekOpt(ctx, position*1000, &spotify.PlayOptions{DeviceID: &conf.DeviceID})
err = conf.Client.SeekOpt(ctx, int(position)*1000, &spotify.PlayOptions{DeviceID: &conf.DeviceID})
if err != nil {
helper.LogErrorAndExit(err)
}
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
spc (1.2.1-1) jammy; urgency=medium

* Update dependencies

-- David Muckle <[email protected]> Thu, 04 Jul 2024 13:32:10 -0400

spc (1.2.0-1) jammy; urgency=medium

* Add shuffle command
Expand Down
24 changes: 10 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@ module github.com/dvdmuckle/spc
go 1.20

require (
github.com/golang/glog v1.2.0
github.com/golang/glog v1.2.1
github.com/ktr0731/go-fuzzyfinder v0.8.0
github.com/mitchellh/go-homedir v1.1.0
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
github.com/zalando/go-keyring v0.2.3
github.com/zmb3/spotify/v2 v2.4.1
golang.org/x/oauth2 v0.16.0
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
github.com/zalando/go-keyring v0.2.5
github.com/zmb3/spotify/v2 v2.4.2
golang.org/x/oauth2 v0.21.0
)

require (
github.com/alessio/shellescape v1.4.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/danieljoos/wincred v1.2.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gdamore/encoding v1.0.0 // indirect
github.com/gdamore/tcell/v2 v2.6.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/ktr0731/go-ansisgr v0.1.0 // indirect
Expand All @@ -30,7 +29,7 @@ require (
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/nsf/termbox-go v1.1.1 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand All @@ -44,12 +43,9 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.16.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
Loading