Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Baillie <[email protected]>
  • Loading branch information
martinbaillie committed Mar 21, 2024
1 parent fb3d029 commit d6e7032
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
15 changes: 6 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Run tests
run: make docker-integration-test

- name: Upload coverage
uses: codecov/[email protected]
with:
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
- run: nix develop --command bash -c "lint && integration"
- uses: codecov/[email protected]
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: test/coverage.out
1 change: 0 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ linters:
- durationcheck # checks for two durations multiplied together
- errcheck # checking for unchecked errors, these unchecked errors can be critical bugs in some cases
- errname # checks that sentinel errors are prefixed with the Err and error types are suffixed with the Error
- errorlint # finds code that will cause problems with the error wrapping scheme introduced in Go 1.13
- execinquery # checks query string in Query function which reads your Go src files and warning it finds
- exhaustive # checks exhaustiveness of enum switch statements
- exportloopref # checks for pointers to enclosing loop variables
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"-X github.com/prometheus/common/version.Branch=main"
"-X github.com/prometheus/common/version.BuildUser=nix"
];
doCheck = false;
};

devShells.default = pkgs.devshell.mkShell rec {
Expand All @@ -95,7 +96,6 @@
packages = with pkgs; [
bashInteractive
coreutils
cosign
gnugrep
go
golangci-lint
Expand Down
2 changes: 1 addition & 1 deletion github/path_permission_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ func (b *backend) pathPermissionSetCreateUpdate(
}

func (b *backend) pathPermissionSetListRead(
ctx context.Context, req *logical.Request, d *framework.FieldData,
ctx context.Context, req *logical.Request, _ *framework.FieldData,
) (*logical.Response, error) {
permissionsets, err := req.Storage.List(ctx, "permissionset/")
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions github/revocation.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func (b *backend) Revoke(
var token string
{
var tokenIface any

if tokenIface, _, err = d.GetOkErr("token"); err != nil {
return nil, err
}
Expand Down

0 comments on commit d6e7032

Please sign in to comment.