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

update mdctl -> 1.0.73, add terraform pin #29

Merged
merged 2 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
- macos-14
name: nix (${{ matrix.os }})
runs-on: ${{ matrix.os }}
Expand All @@ -16,8 +16,4 @@ jobs:
with:
extra_nix_config: |
experimental-features = nix-command flakes
- uses: cachix/cachix-action@master
with:
name: medable
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- run: nix --show-trace build -f . custom jacobi_tools
4 changes: 2 additions & 2 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: formatting
on: {workflow_dispatch, push: {branches: [main]}, pull_request}
jobs:
prettier:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/[email protected]
- uses: cachix/install-nix-action@V27
Expand All @@ -12,7 +12,7 @@ jobs:
- run: nix-env -f . -iA pkgs.nodePackages.prettier
- run: prettier --check .
nixpkgs-fmt:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/[email protected]
- uses: cachix/install-nix-action@V27
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/statix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: statix
on: {workflow_dispatch, push: {branches: [main]}, pull_request}
jobs:
statix:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/[email protected]
- uses: cachix/install-nix-action@V27
Expand Down
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let
inherit (jacobi) portwatch __rd __rd_shell __pg_bootstrap __pg_shell __pg __run;
inherit (jacobi) pog hex hexcast nixup nixcache nixsum nix_hash_medable nix_hash_jpetrucciani;
inherit (jacobi) srv _zaddy zaddy zaddy-browser;
inherit (jacobi) poetry2nix nix2container foundry;
inherit (jacobi) poetry2nix nix2container foundry terraform_1-5-5;
};
in
pkgs // pkgs.custom // jacobi_tools // {
Expand Down
2 changes: 1 addition & 1 deletion mods/pkgs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ This directory contains a working version of Medable's [mdctl](https://github.co

### [mdctl-alpha/](./mdctl-alpha/)

This directory contains a working version of Medable's [mdctl](https://github.com/Medable/mdctl) CLI tool
This directory contains a working version of Medable's [mdctl](https://github.com/Medable/mdctl) CLI tool (alpha releases)
2 changes: 1 addition & 1 deletion mods/pkgs/mdctl-alpha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "pkg",
"version": "0.0.0",
"dependencies": {
"@medable/mdctl-cli": "1.0.71-alpha.5"
"@medable/mdctl-cli": "1.0.73-alpha.1"
}
}
237 changes: 119 additions & 118 deletions mods/pkgs/mdctl-alpha/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mods/pkgs/mdctl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "pkg",
"version": "0.0.0",
"dependencies": {
"@medable/mdctl-cli": "1.0.72"
"@medable/mdctl-cli": "1.0.73"
}
}
236 changes: 118 additions & 118 deletions mods/pkgs/mdctl/yarn.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pins/jpetrucciani.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2024-07-03",
"rev": "9d66002b66fd064a02f5f64d6bca43d2b3ff5011",
"sha256": "15sk6qv15jfrysflvw4aipnps05sfvpc7aqb9hkk60r6i4qw4n02"
"date": "2024-07-31",
"rev": "f2e07a344880dca88a24873abbe10245426e2760",
"sha256": "0pl1m4a3l4s66b87blxn8k60nbylr294wyf56ngbqh60cakndnmz"
}
6 changes: 3 additions & 3 deletions pins/nixpkgs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2024-07-03",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"sha256": "1l08y0mighz4gz0801sbplgmydmcmdad4ckg86hazfhqjw5q8zqz"
"date": "2024-07-31",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"sha256": "1aabz2zbbf2l6b85v04cc64ff8hfp09g3hnj41iq45kcpb9r3qmx"
}