Skip to content

Commit

Permalink
Merge pull request #43 from Mic92/dependabot/go_modules/golang.org/x/…
Browse files Browse the repository at this point in the history
…crypto-0.13.0

Dependabot/go modules/golang.org/x/crypto 0.13.0
  • Loading branch information
Mic92 authored Sep 11, 2023
2 parents 8039023 + e0b3e35 commit 4653443
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 10 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ on:
schedule:
- cron: '51 2 * * *'
jobs:
cross-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v23
- run: nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz --pure -p gox -p go --run "gox -osarch '!darwin/386' ."
tests:
strategy:
matrix:
Expand Down
1 change: 0 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
queue_rules:
- name: default
merge_conditions:
- check-success=cross-build
- check-success=tests (nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-23.05.tar.gz,
macos-latest)
- check-success=tests (nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-23.05.tar.gz,
Expand Down
27 changes: 24 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,35 @@
flake-parts.url = "github:/hercules-ci/flake-parts";
};

outputs = inputs@{ flake-parts, ... }:
outputs = inputs@{ self, flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } ({ lib, ... }: {
systems = lib.systems.flakeExposed;
perSystem = { config, self', inputs', pkgs, system, ... }: {
perSystem = { config, self', inputs', pkgs, system, ... }: {
packages = {
ssh-to-age = (pkgs.callPackage ./default.nix {});
ssh-to-age = (pkgs.callPackage ./default.nix { });
default = config.packages.ssh-to-age;
};
checks =
let
packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages;
devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells;
in
{
cross-build = self'.packages.ssh-to-age.overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gox ];
buildPhase = ''
runHook preBuild
HOME=$TMPDIR gox -verbose -osarch '!darwin/386' ./cmd/ssh-to-age/
runHook postBuild
'';
doCheck = false;
installPhase = ''
runHook preBuild
touch $out
runHook postBuild
'';
});
} // packages // devShells;
};
});
}

0 comments on commit 4653443

Please sign in to comment.