Skip to content

Commit

Permalink
Merge pull request #84 from libsv/enhancement/slan-1.15
Browse files Browse the repository at this point in the history
Enhancement: Remove 1.15 from build and upgrade package to 1.17
  • Loading branch information
theflyingcodr authored Nov 19, 2021
2 parents 1346c80 + 18edb9a commit 0121a8f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 22 deletions.
23 changes: 4 additions & 19 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,12 @@ pull_request_rules:
conditions:
- -draft
- author~=^dependabot(|-preview)\[bot\]$
- check-success='build (1.14.x, ubuntu-latest)'
- check-success='build (1.15.x, ubuntu-latest)'
- check-success='build (1.16.x, ubuntu-latest)'
- check-success='build (1.17.x, ubuntu-latest)'
- check-success='build (1.14.x, macos-latest)'
- check-success='build (1.15.x, macos-latest)'
- check-success='build (1.16.x, macos-latest)'
- check-success='build (1.17.x, macos-latest)'
- check-success='lint (1.15.x, ubuntu-latest)'
- check-success='lint (1.16.x, ubuntu-latest)'
- check-success='lint (1.15.x, macos-latest)'
- check-success='lint (1.17.x, ubuntu-latest)'
- check-success='lint (1.16.x, macos-latest)'
- check-success='lint (1.17.x, macos-latest)'
- check-success='Analyze (go)'
Expand All @@ -32,17 +27,12 @@ pull_request_rules:
- name: Alert on major version detection
conditions:
- author~=^dependabot(|-preview)\[bot\]$
- check-success='build (1.14.x, ubuntu-latest)'
- check-success='build (1.15.x, ubuntu-latest)'
- check-success='build (1.16.x, ubuntu-latest)'
- check-success='build (1.17.x, ubuntu-latest)'
- check-success='build (1.14.x, macos-latest)'
- check-success='build (1.15.x, macos-latest)'
- check-success='build (1.16.x, macos-latest)'
- check-success='build (1.17.x, macos-latest)'
- check-success='lint (1.15.x, ubuntu-latest)'
- check-success='lint (1.16.x, ubuntu-latest)'
- check-success='lint (1.15.x, macos-latest)'
- check-success='lint (1.17.x, ubuntu-latest)'
- check-success='lint (1.16.x, macos-latest)'
- check-success='lint (1.17.x, macos-latest)'
- check-success='Analyze (go)'
Expand All @@ -59,17 +49,12 @@ pull_request_rules:
- name: Automatic Merge ⬇️ on Approval ✔
conditions:
- "#approved-reviews-by>=1"
- check-success='build (1.14.x, ubuntu-latest)'
- check-success='build (1.15.x, ubuntu-latest)'
- check-success='build (1.16.x, ubuntu-latest)'
- check-success='build (1.17.x, ubuntu-latest)'
- check-success='build (1.14.x, macos-latest)'
- check-success='build (1.15.x, macos-latest)'
- check-success='build (1.16.x, macos-latest)'
- check-success='build (1.17.x, macos-latest)'
- check-success='lint (1.15.x, ubuntu-latest)'
- check-success='lint (1.16.x, ubuntu-latest)'
- check-success='lint (1.15.x, macos-latest)'
- check-success='lint (1.17.x, ubuntu-latest)'
- check-success='lint (1.16.x, macos-latest)'
- check-success='lint (1.17.x, macos-latest)'
- check-success='Analyze (go)'
Expand Down Expand Up @@ -258,4 +243,4 @@ pull_request_rules:
# summary: |
# {% if not check_succeed %}
# Your pull request title must follow [Conventional Commit](https://www.conventionalcommits.org/en/v1.0.0/).
# {% endif %}
# {% endif %}
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
golangci:
strategy:
matrix:
go-version: [1.15.x, 1.16.x, 1.17.x]
go-version: [1.16.x, 1.17.x]
os: [macos-latest, ubuntu-latest]
name: lint
runs-on: ${{ matrix.os }}
Expand All @@ -30,7 +30,7 @@ jobs:
build:
strategy:
matrix:
go-version: [ 1.14.x, 1.15.x, 1.16.x, 1.17.x ]
go-version: [ 1.16.x, 1.17.x ]
os: [ macos-latest, ubuntu-latest ]
runs-on: ${{ matrix.os }}
steps:
Expand Down
8 changes: 7 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/libsv/go-bt/v2

go 1.16
go 1.17

require (
github.com/libsv/go-bk v0.1.5
Expand All @@ -9,3 +9,9 @@ require (
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)

0 comments on commit 0121a8f

Please sign in to comment.