Skip to content

Commit

Permalink
Problem: go 1.22 is not used
Browse files Browse the repository at this point in the history
Solution:
- update nixpkgs to unstable branch

update go in workflows
  • Loading branch information
yihuang committed Feb 19, 2024
1 parent 7c976f4 commit b6fbab5
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
- id: changed-files
uses: tj-actions/changed-files@v41
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v23
with:
Expand All @@ -38,7 +38,7 @@ jobs:
*.sum
- name: run golangci-lint
run: |
nix profile install nixpkgs#golangci-lint
nix profile install -f ./nix golangci-lint
nix profile install -f ./nix rocksdb
export PKG_CONFIG_PATH=$HOME/.nix-profile/lib/pkgconfig
export CGO_CFLAGS="$(pkg-config --cflags rocksdb)" CGO_LDFLAGS="$(pkg-config --libs rocksdb)"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
if: github.event_name == 'push' || github.event_name == 'pull_request'
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
- name: Display go version
run: go version
- run: make build
Expand All @@ -131,7 +131,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
- name: Display go version
run: go version
- name: Install runsim
Expand All @@ -158,7 +158,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
- name: Checkout Comment PR Branch
uses: actions/checkout@v3
if: github.event_name == 'issue_comment'
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
- name: Checkout Comment PR Branch
uses: actions/checkout@v3
if: github.event_name == 'issue_comment'
Expand Down Expand Up @@ -270,7 +270,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
- name: Checkout Comment PR Branch
uses: actions/checkout@v3
if: github.event_name == 'issue_comment'
Expand Down Expand Up @@ -326,7 +326,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: '^1.22.0'
- name: Checkout Comment PR Branch
uses: actions/checkout@v3
if: github.event_name == 'issue_comment'
Expand Down
8 changes: 4 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
nix-bundle-exe = {
url = "github:3noch/nix-bundle-exe";
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/crypto-org-chain/cronos/v2

go 1.21
go 1.22

require (
cosmossdk.io/api v0.3.1
Expand Down
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "release-23.11",
"branch": "nixpkgs-unstable",
"description": "Nix Packages collection",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0ca77ade2a34c5466be6d54f1267507860c95da8",
"sha256": "11q88xx5njl31h3qrc213qx43yi9fqlfrbfwv2h5dgamgbpp2jk9",
"rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803",
"sha256": "0mmgk3bg8rqs4mlsaxr5hyvzqn3sg53pqqm1aiwq00kmcnhds7nx",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/0ca77ade2a34c5466be6d54f1267507860c95da8.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/86ef6bd96b6279e1a4a53236d341f5df1ede3803.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"poetry2nix": {
Expand Down

0 comments on commit b6fbab5

Please sign in to comment.