Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kairos-io/kairos-sdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.1.8
Choose a base ref
...
head repository: kairos-io/kairos-sdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.2.0
Choose a head ref
  • 11 commits
  • 14 files changed
  • 3 contributors

Commits on Jun 4, 2024

  1. Port signature utils to sdk from agent (#117) 

    It was added first to agent as it was needed for upgrade but if we are
gonna reuse this to check for signature validity in random files, we
better have it on sdk so we can use it both on agent and immucore and
works exactly the same

Signed-off-by: Itxaka <itxaka@kairos.io>
    @Itxaka
    Itxaka authored Jun 4, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a0c7d13 View commit details

  2. Update renovate.json

    @Itxaka
    Itxaka authored Jun 4, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59d31f0 View commit details

  3. fix(deps): update module golang.org/x/mod to v0.17.0 (#91) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jun 4, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dae0fd0 View commit details

  4. Update go.mod

    @Itxaka
    Itxaka authored Jun 4, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    291b1d0 View commit details

  5. fix(deps): update module github.com/containerd/containerd to v1.7.11 … 

    …[security]
    @renovate
    renovate[bot] committed Jun 4, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    eaf93cd View commit details

  6. fix(deps): update module github.com/mudler/yip to v1.7.0

    @renovate
    renovate[bot] committed Jun 4, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    f006ddc View commit details

  7. fix(deps): update module github.com/rs/zerolog to v1.33.0 (#119) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jun 4, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    387848b View commit details

  8. fix(deps): update module gopkg.in/yaml.v2 to v3 (#7) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jun 4, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    84b81c2 View commit details

  9. fix(deps): update module gopkg.in/yaml.v1 to v3 (#14) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jun 4, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4561169 View commit details

  10. Fix lint 

    Signed-off-by: Itxaka <itxaka@kairos.io>
    @Itxaka
    Itxaka committed Jun 4, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    894416b View commit details

  11. Export signature method 

    Signed-off-by: Itxaka <itxaka@kairos.io>
    @Itxaka
    Itxaka committed Jun 4, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    1cb58b5 View commit details
19 changes: 11 additions & 8 deletions Earthfile
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ VERSION 0.7
# renovate: datasource=docker depName=golang
ARG --global GO_VERSION=1.20
# renovate: datasource=docker depName=golangci-lint
ARG --global GOLINT_VERSION=v1.51
ARG --global GOLINT_VERSION=1.51.0
# renovate: datasource=docker depName=quay.io/luet/base
ARG --global LUET_VERSION=0.34.0

@@ -15,22 +15,25 @@ go-deps:
ARG GO_VERSION
FROM golang:$GO_VERSION-alpine
WORKDIR /build
COPY go.mod go.sum ./
COPY . .
RUN go mod tidy
RUN go mod download
SAVE ARTIFACT go.mod AS LOCAL go.mod
SAVE ARTIFACT go.sum AS LOCAL go.sum
RUN go mod verify


test:
FROM +go-deps
ENV CGO_ENABLED=0
WORKDIR /build
COPY +luet/luet /usr/bin/luet
COPY . .

RUN go run github.com/onsi/ginkgo/v2/ginkgo run --fail-fast --slow-spec-threshold 30s --covermode=atomic --coverprofile=coverage.out -p -r ./...

Check failure on line 30 in Earthfile

GitHub Actions / unit-tests (1.21)

Error 

The command RUN go run github.com/onsi/ginkgo/v2/ginkgo run --fail-fast --slow-spec-threshold 30s --covermode=atomic --coverprofile=coverage.out -p -r ./... did not complete successfully. Exit code 1
SAVE ARTIFACT coverage.out AS LOCAL coverage.out


lint:
FROM golangci/golangci-lint:$GOLINT_VERSION
FROM +go-deps
ARG GOLINT_VERSION
RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v$GOLINT_VERSION
WORKDIR /build
COPY . .
RUN golangci-lint run
RUN bin/golangci-lint run -v
20 changes: 11 additions & 9 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,17 @@ module github.com/kairos-io/kairos-sdk

go 1.19

// This versions require go1.20
// Higher versions require go1.20
replace (
github.com/onsi/ginkgo/v2 v2.17.1 => github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.32.0 => github.com/onsi/gomega v1.28.0
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega => github.com/onsi/gomega v1.28.0
)

require (
github.com/avast/retry-go v2.7.0+incompatible
github.com/containerd/containerd v1.7.6
github.com/denisbrodbeck/machineid v1.0.1
github.com/edsrzf/mmap-go v1.1.0
github.com/foxboron/go-uefi v0.0.0-20240522180132-205d5597883a
github.com/google/go-containerregistry v0.19.1
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
@@ -20,18 +21,19 @@ require (
github.com/jaypipes/ghw v0.12.0
github.com/joho/godotenv v1.5.1
github.com/mudler/go-pluggable v0.0.0-20230126220627-7710299a0ae5
github.com/mudler/yip v1.6.0
github.com/mudler/yip v1.7.0
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.32.0
github.com/onsi/gomega v1.33.0
github.com/pterm/pterm v0.12.63
github.com/qeesung/image2ascii v1.0.1
github.com/rs/zerolog v1.32.0
github.com/rs/zerolog v1.33.0
github.com/saferwall/pe v1.5.3
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
github.com/swaggest/jsonschema-go v0.3.62
github.com/twpayne/go-vfs/v4 v4.3.0
github.com/urfave/cli/v2 v2.27.1
github.com/zcalusic/sysinfo v1.0.1
golang.org/x/mod v0.14.0
golang.org/x/mod v0.17.0
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
@@ -50,7 +52,6 @@ require (
github.com/containerd/cgroups v1.1.0 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/continuity v0.4.2 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/docker/cli v24.0.0+incompatible // indirect
@@ -87,6 +88,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/secDre4mer/pkcs7 v0.0.0-20240322103146-665324a4461d // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/swaggest/refl v1.3.0 // indirect
@@ -96,7 +98,7 @@ require (
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
Loading