Skip to content

Commit

Permalink
Merge pull request #32 from purcell/gem-updates-oct-2024
Browse files Browse the repository at this point in the history
Gem updates for project env
  • Loading branch information
purcell authored Oct 29, 2024
2 parents ef6dda8 + ece6674 commit 1696ade
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 92 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
matrix:
os: [ubuntu-latest]
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
ruby: ['2.7', '3.0', '3.1', '3.2']
ruby: ['3.0', '3.1', '3.2', '3.3']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ruby ">= 2.7"
ruby ">= 3.0"

source "https://rubygems.org"

Expand Down
38 changes: 22 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
diff-lcs (1.5.0)
google-protobuf (3.25.0)
pg_query (4.2.3)
bigdecimal (3.1.8)
diff-lcs (1.5.1)
google-protobuf (4.28.3)
bigdecimal
rake (>= 13)
pg_query (5.1.0)
google-protobuf (>= 3.22.3)
rake (13.1.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rake (13.2.1)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.2)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)

PLATFORMS
ruby
Expand All @@ -28,5 +31,8 @@ DEPENDENCIES
rake
rspec

RUBY VERSION
ruby 3.3.5p100

BUNDLED WITH
2.4.2
2.5.16
40 changes: 3 additions & 37 deletions flake.lock

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

38 changes: 20 additions & 18 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,31 @@

inputs = {
nixpkgs.url = "nixpkgs/nixpkgs-unstable";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, nixpkgs, flake-utils }@inputs:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
env = pkgs.bundlerEnv {
name = "sqlint";
gemdir = ./.;
groups = [ "default" "development" "test" ];
outputs = { self, nixpkgs }@inputs:
let
forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all;
in
{
devShell =forAllSystems (system:
let
pkgs = import nixpkgs { inherit system; };
env = pkgs.bundlerEnv {
name = "sqlint";
gemdir = ./.;
groups = [ "default" "development" "test" ];

meta = with pkgs.lib;
meta = with pkgs.lib;
{
description = "sqlint";
platforms = platforms.unix;
};
};
in
{
devShell = pkgs.mkShell {
buildInputs = [ env pkgs.bundix ];
};
}
);
};
in
pkgs.mkShell {
buildInputs = [ env pkgs.bundix ];
}
);
};
}
47 changes: 29 additions & 18 deletions gemset.nix
Original file line number Diff line number Diff line change
@@ -1,97 +1,108 @@
{
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
version = "3.1.8";
};
diff-lcs = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
type = "gem";
};
version = "1.5.0";
version = "1.5.1";
};
google-protobuf = {
dependencies = ["bigdecimal" "rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm";
sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0";
type = "gem";
};
version = "3.25.0";
version = "4.28.3";
};
pg_query = {
dependencies = ["google-protobuf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w";
sha256 = "0p8ljf694qvrf5875ljg6kp7gvmndy8490kasjzcq22ghryg9xxp";
type = "gem";
};
version = "4.2.3";
version = "5.1.0";
};
rake = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
type = "gem";
};
version = "13.1.0";
version = "13.2.1";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
type = "gem";
};
version = "3.12.0";
version = "3.13.0";
};
rspec-core = {
dependencies = ["rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm";
sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl";
type = "gem";
};
version = "3.12.2";
version = "3.13.2";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89";
sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
type = "gem";
};
version = "3.12.3";
version = "3.13.3";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy";
sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3";
type = "gem";
};
version = "3.12.6";
version = "3.13.2";
};
rspec-support = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr";
sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
type = "gem";
};
version = "3.12.1";
version = "3.13.1";
};
}
2 changes: 1 addition & 1 deletion sqlint.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Gem::Specification.new do |s|
s.name = 'sqlint'
s.version = SQLint::VERSION
s.platform = Gem::Platform::RUBY
s.required_ruby_version = '>= 2.7'
s.required_ruby_version = '>= 3.0'
s.authors = ['Steve Purcell', 'Kieran Trezona-le Comte']
s.description = <<-EOF
Simple SQL linter.
Expand Down

0 comments on commit 1696ade

Please sign in to comment.