Skip to content

Commit

Permalink
0.9.1 logos
Browse files Browse the repository at this point in the history
  • Loading branch information
zachmann committed Feb 14, 2024
2 parents 3712985 + f38f01e commit 62d52c0
Show file tree
Hide file tree
Showing 11 changed files with 84 additions and 63 deletions.
11 changes: 1 addition & 10 deletions .gitlab-ci-scripts/goreleaser.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,5 @@ GORELEASER_CONFIG=".goreleaser.yml"
if [ -n "$CI_COMMIT_TAG" ] && echo "$CI_COMMIT_TAG" | grep -qv '~'; then
GORELEASER_CONFIG=".goreleaser-release.yml"
fi
BASEDIR=/go/src/github.com/oidc-mytoken/server
docker run --rm --privileged \
-v "$PWD":"$BASEDIR" \
-w "$BASEDIR" \
-v "${PWD}/../shared":/tmp/shared \
-v /var/run/docker.sock:/var/run/docker.sock \
-e DOCKER_USERNAME -e DOCKER_PASSWORD \
-e GITHUB_TOKEN \
-e GORELEASER_CONFIG \
goreleaser/goreleaser release -f $GORELEASER_CONFIG --release-notes /tmp/shared/release.md
goreleaser release -f $GORELEASER_CONFIG --release-notes ../shared/release.md
ls -l results
10 changes: 7 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ build_migratedb:
prerelease:
stage: release
image:
name: docker:stable
name: goreleaser/goreleaser
entrypoint: [ "" ]
services:
- docker:dind
only:
Expand All @@ -78,12 +79,15 @@ prerelease:
GIT_DEPTH: 0
REPO_HOST: repo.data.kit.edu
REPO_USER: cicd
DOCKER_REGISTRY: https://index.docker.io/v1/
before_script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin "$DOCKER_REGISTRY"
script:
- if [ -z "$CI_COMMIT_TAG" ]; then docker run --rm -v $PWD:/tmp/mytoken -w /tmp/mytoken bitnami/git .gitlab-ci-scripts/set-prerel-version.sh; fi;
- if [ -z "$CI_COMMIT_TAG" ]; then .gitlab-ci-scripts/set-prerel-version.sh; fi;
- .gitlab-ci-scripts/goreleaser.sh
- .gitlab-ci-scripts/upload.sh
after_script:
- docker run --rm curlimages/curl -d "repo=github.com/oidc-mytoken/server" https://goreportcard.com/checks
- curl -d "repo=github.com/oidc-mytoken/server" https://goreportcard.com/checks

deploy-dev:
stage: deploy
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,28 @@
<!-- ### Dependencies -->
<!-- -->

## mytoken 0.9.1

### Enhancements

- Improfile includes handling in the webitnerface restrictions editor.

### Dependencies

- Bump golang.org/x/oauth2 from 0.15.0 to 0.17.0
- Bump golang.org/x/crypto from 0.17.0 to 0.19.0
- Bump golang.org/x/mod from 0.14.0 to 0.15.0
- Bump github.com/evanphx/json-patch/v5 from 5.7.0 to 5.9.0
- Bump github.com/gofiber/template/mustache/v2 from 2.0.7 to 2.0.8
- Bump github.com/lestrrat-go/jwx from 1.2.27 to 1.2.28
- Bump github.com/gofiber/fiber/v2 from 2.51.0 to 2.52.0
- Bump github.com/redis/go-redis/v9 from 9.3.1 to 9.4.0
- Bump github.com/valyala/fasthttp from 1.51.0 to 1.52.0
- Bump github.com/coreos/go-oidc/v3 from 3.8.0 to 3.9.0
- Bump github.com/gliderlabs/ssh from 0.3.5 to 0.3.6
- Bump github.com/go-resty/resty/v2 from 2.10.0 to 2.11.0
- Bump golang.org/x/term from 0.15.0 to 0.17.0

## mytoken 0.9.0

### Changes
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020-2023 Gabriel Zachmann
Copyright (c) 2020-2024 Gabriel Zachmann

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
30 changes: 15 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,43 @@ require (
github.com/Songmu/prompter v0.5.1
github.com/arran4/golang-ical v0.2.1
github.com/coreos/go-oidc/v3 v3.9.0
github.com/evanphx/json-patch/v5 v5.7.0
github.com/evanphx/json-patch/v5 v5.9.0
github.com/fatih/structs v1.1.0
github.com/gliderlabs/ssh v0.3.6
github.com/go-resty/resty/v2 v2.11.0
github.com/go-sql-driver/mysql v1.7.1
github.com/gofiber/fiber/v2 v2.51.0
github.com/gofiber/fiber/v2 v2.52.0
github.com/gofiber/helmet/v2 v2.2.26
github.com/gofiber/template/mustache/v2 v2.0.7
github.com/gofiber/template/mustache/v2 v2.0.8
github.com/gofrs/uuid v4.4.0+incompatible
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/ip2location/ip2location-go v8.3.0+incompatible
github.com/jinzhu/copier v0.4.0
github.com/jmoiron/sqlx v1.3.5
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
github.com/lestrrat-go/jwx v1.2.27
github.com/lestrrat-go/jwx v1.2.28
github.com/oidc-mytoken/api v0.11.2-0.20230810083726-bf164306e5b2
github.com/oidc-mytoken/lib v0.7.1
github.com/oidc-mytoken/utils v0.1.3-0.20230731143919-ea5b78243e5d
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pires/go-proxyproto v0.7.0
github.com/pkg/errors v0.9.1
github.com/redis/go-redis/v9 v9.3.1
github.com/redis/go-redis/v9 v9.4.0
github.com/sethvargo/go-limiter v0.7.2
github.com/sirupsen/logrus v1.9.3
github.com/urfave/cli/v2 v2.3.1-0.20211205195634-e8d81738896c
github.com/valyala/fasthttp v1.51.0
github.com/valyala/fasthttp v1.52.0
github.com/zachmann/go-oidcfed v0.1.0
golang.org/x/crypto v0.17.0
golang.org/x/mod v0.14.0
golang.org/x/oauth2 v0.15.0
golang.org/x/term v0.16.0
golang.org/x/crypto v0.19.0
golang.org/x/mod v0.15.0
golang.org/x/oauth2 v0.17.0
golang.org/x/term v0.17.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/adam-hanna/arrayOperations v1.0.1 // indirect
github.com/andybalholm/brotli v1.0.5 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/cbroglie/mustache v1.4.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -54,8 +54,8 @@ require (
github.com/gofiber/template v1.8.2 // indirect
github.com/gofiber/utils v1.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/klauspost/compress v1.17.6 // indirect
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
Expand All @@ -70,8 +70,8 @@ require (
github.com/tinylib/msgp v1.1.8 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/tcplisten v1.0.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
Expand Down
Loading

0 comments on commit 62d52c0

Please sign in to comment.