Skip to content

Commit

Permalink
(misc) Update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: R.I.Pienaar <[email protected]>
  • Loading branch information
ripienaar committed Mar 5, 2024
1 parent 615295b commit 9a67919
Show file tree
Hide file tree
Showing 7 changed files with 222 additions and 154 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: choria-io/actions/packager@main
with:
build_package: el7_64
packager_tag: el7-go1.19
packager_tag: el7-go1.21
version: ${{ env.build_version }}

el8_64:
Expand All @@ -25,7 +25,7 @@ jobs:
uses: choria-io/actions/packager@main
with:
build_package: el8_64
packager_tag: el8-go1.19
packager_tag: el8-go1.21
version: ${{ env.build_version }}

el9_64:
Expand All @@ -35,7 +35,7 @@ jobs:
uses: choria-io/actions/packager@main
with:
build_package: el9_64
packager_tag: el9-go1.19
packager_tag: el9-go1.21
version: ${{ env.build_version }}

docker:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: choria-io/actions/packager@main
with:
build_package: el7_64
packager_tag: el7-go1.19
packager_tag: el7-go1.21
version: tag

el8_64:
Expand All @@ -22,7 +22,7 @@ jobs:
uses: choria-io/actions/packager@main
with:
build_package: el8_64
packager_tag: el8-go1.19
packager_tag: el8-go1.21
version: tag

upload:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ jobs:
test:
strategy:
matrix:
go: [1.19]
go: ["1.21", "1.22"]

runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: ${{matrix.go}}

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM almalinux:8
FROM almalinux:9

ARG REPO="https://yum.eu.choria.io/release/el/release.repo"

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile-nightly
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM almalinux:8
FROM almalinux:9

ARG DATE="unknown"

WORKDIR /etc/choria-provisioner/

COPY choria-provisioner-0.99.0.${DATE}-1.el8.x86_64.rpm /tmp
COPY choria-provisioner-0.99.0.${DATE}-1.el9.x86_64.rpm /tmp


RUN yum -y install ruby nc procps-ng openssl && \
yum -y localinstall /tmp/choria-provisioner-0.99.0.${DATE}-1.el8.x86_64.rpm && \
yum -y localinstall /tmp/choria-provisioner-0.99.0.${DATE}-1.el9.x86_64.rpm && \
yum -y clean all

RUN groupadd --gid 2048 choria && \
Expand Down
87 changes: 46 additions & 41 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,86 +1,91 @@
module github.com/choria-io/provisioner

go 1.19
go 1.21.0

require (
github.com/choria-io/fisk v0.4.0
github.com/choria-io/go-choria v0.27.1-0.20230419143246-b414cb95c864
github.com/choria-io/tokens v0.0.2
github.com/choria-io/fisk v0.6.2
github.com/choria-io/go-choria v0.28.0
github.com/choria-io/tokens v0.0.3
github.com/ghodss/yaml v1.0.0
github.com/onsi/ginkgo/v2 v2.9.2
github.com/onsi/gomega v1.27.6
github.com/prometheus/client_golang v1.15.0
github.com/sirupsen/logrus v1.9.0
github.com/onsi/ginkgo/v2 v2.16.0
github.com/onsi/gomega v1.31.1
github.com/prometheus/client_golang v1.19.0
github.com/sirupsen/logrus v1.9.3
)

require (
github.com/AlecAivazis/survey/v2 v2.3.6 // indirect
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
github.com/Freman/eventloghook v0.0.0-20191003051739-e4d803b6b48b // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/antonmedv/expr v1.12.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/choria-io/go-updater v0.1.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.14.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.15.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/expr-lang/expr v1.16.1 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/pprof v0.0.0-20230406165453-00490a63f317 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gosuri/uilive v0.0.4 // indirect
github.com/gosuri/uiprogress v0.0.1 // indirect
github.com/guptarohit/asciigraph v0.5.5 // indirect
github.com/guptarohit/asciigraph v0.5.6 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/looplab/fsm v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/miekg/pkcs11 v1.1.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nats-io/jsm.go v0.0.35 // indirect
github.com/nats-io/nats-server/v2 v2.9.16 // indirect
github.com/nats-io/nats.go v1.25.0 // indirect
github.com/nats-io/nkeys v0.4.4 // indirect
github.com/nats-io/jsm.go v0.1.1-0.20240111112330-8508bd502b64 // indirect
github.com/nats-io/nats-server/v2 v2.10.11 // indirect
github.com/nats-io/nats.go v1.33.1 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/open-policy-agent/opa v0.51.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/open-policy-agent/opa v0.62.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.49.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/segmentio/ksuid v1.0.4 // indirect
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
github.com/tidwall/gjson v1.14.4 // indirect
github.com/tidwall/gjson v1.17.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5 // indirect
github.com/yashtewari/glob-intersection v0.1.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
github.com/yashtewari/glob-intersection v0.2.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.8.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/term v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/tools v0.8.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.19.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 9a67919

Please sign in to comment.