Compare commits
10 Commits
b29418d1b5
...
v0.4.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 990e2a2e43 | |||
| ae384e7b46 | |||
| e9ec29d60e | |||
| 1daa48ade1 | |||
| b5978a18a1 | |||
| 6d7703c3f2 | |||
| 3291f8f73d | |||
| 3a4c9ea1c1 | |||
| b0d8f57b6f | |||
| 45cb378022 |
+42
-14
@@ -1,5 +1,5 @@
|
|||||||
when:
|
when:
|
||||||
- event: release
|
- event: tag
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: test
|
- name: test
|
||||||
@@ -7,25 +7,53 @@ steps:
|
|||||||
commands:
|
commands:
|
||||||
- go test ./...
|
- go test ./...
|
||||||
|
|
||||||
- name: build
|
- name: build-linux-amd64
|
||||||
image: golang:latest
|
image: golang:latest
|
||||||
commands:
|
commands:
|
||||||
- VERSION=${CI_COMMIT_TAG}
|
- GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X main.version=${CI_COMMIT_TAG}" -o node-lookup-linux-amd64 ./...
|
||||||
- go build -ldflags="-s -w -X main.version=${VERSION}" -o node-lookup ./...
|
depends_on: [test]
|
||||||
|
|
||||||
|
- name: build-linux-arm64
|
||||||
|
image: golang:latest
|
||||||
|
commands:
|
||||||
|
- GOOS=linux GOARCH=arm64 go build -ldflags="-s -w -X main.version=${CI_COMMIT_TAG}" -o node-lookup-linux-arm64 ./...
|
||||||
|
depends_on: [test]
|
||||||
|
|
||||||
|
- name: build-darwin-amd64
|
||||||
|
image: golang:latest
|
||||||
|
commands:
|
||||||
|
- GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X main.version=${CI_COMMIT_TAG}" -o node-lookup-darwin-amd64 ./...
|
||||||
|
depends_on: [test]
|
||||||
|
|
||||||
|
- name: build-darwin-arm64
|
||||||
|
image: golang:latest
|
||||||
|
commands:
|
||||||
|
- GOOS=darwin GOARCH=arm64 go build -ldflags="-s -w -X main.version=${CI_COMMIT_TAG}" -o node-lookup-darwin-arm64 ./...
|
||||||
depends_on: [test]
|
depends_on: [test]
|
||||||
|
|
||||||
- name: release
|
- name: release
|
||||||
image: woodpeckerci/plugin-gitea-release
|
image: git.unkin.net/unkin/almalinux9-base:20260325
|
||||||
settings:
|
|
||||||
api_key:
|
|
||||||
from_secret: GITEA_TOKEN
|
|
||||||
base_url: https://git.unkin.net
|
|
||||||
files: node-lookup
|
|
||||||
title: ${CI_COMMIT_TAG}
|
|
||||||
environment:
|
environment:
|
||||||
DRONECI_PASSWORD:
|
RELEASER_TOKEN:
|
||||||
from_secret: DRONECI_PASSWORD
|
from_secret: RELEASER_TOKEN
|
||||||
|
commands:
|
||||||
|
- |
|
||||||
|
curl --output /usr/local/bin/tea https://artifactapi.k8s.syd1.au.unkin.net/api/v1/remote/gitea-dl/tea/0.12.0/tea-0.12.0-linux-amd64 && chmod +x /usr/local/bin/tea
|
||||||
|
tea logins add --name gitea --url https://git.unkin.net --token "$${RELEASER_TOKEN}" --no-version-check
|
||||||
|
PREV_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
|
||||||
|
if [ -n "$PREV_TAG" ]; then
|
||||||
|
NOTES=$(git log "${PREV_TAG}..${CI_COMMIT_TAG}" --pretty=format:"- %s")
|
||||||
|
else
|
||||||
|
NOTES=$(git log --pretty=format:"- %s")
|
||||||
|
fi
|
||||||
|
tea releases create --tag "${CI_COMMIT_TAG}" --title "${CI_COMMIT_TAG}" --note "${NOTES}" --login gitea --repo "${CI_REPO}"
|
||||||
|
tea releases assets create "${CI_COMMIT_TAG}" \
|
||||||
|
node-lookup-linux-amd64 \
|
||||||
|
node-lookup-linux-arm64 \
|
||||||
|
node-lookup-darwin-amd64 \
|
||||||
|
node-lookup-darwin-arm64 \
|
||||||
|
--login gitea --repo "${CI_REPO}"
|
||||||
backend_options:
|
backend_options:
|
||||||
kubernetes:
|
kubernetes:
|
||||||
serviceAccountName: default
|
serviceAccountName: default
|
||||||
depends_on: [build]
|
depends_on: [build-linux-amd64, build-linux-arm64, build-darwin-amd64, build-darwin-arm64]
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ BINARY := node-lookup
|
|||||||
VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
|
VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
|
||||||
GOFLAGS := -ldflags="-s -w -X main.version=$(VERSION)"
|
GOFLAGS := -ldflags="-s -w -X main.version=$(VERSION)"
|
||||||
|
|
||||||
.PHONY: all build test lint clean install patch minor major _release
|
.PHONY: all build test lint clean install patch minor major _tag
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
|
||||||
@@ -31,16 +31,15 @@ _PAT := $(shell echo $(_BASE) | sed 's/^v//' | cut -d. -f3)
|
|||||||
|
|
||||||
patch:
|
patch:
|
||||||
@NEW=v$(_MAJ).$(_MIN).$(shell expr $(_PAT) + 1); \
|
@NEW=v$(_MAJ).$(_MIN).$(shell expr $(_PAT) + 1); \
|
||||||
git tag $$NEW && echo "Tagged $$NEW" && $(MAKE) _release TAG=$$NEW
|
git tag $$NEW && echo "Tagged $$NEW" && $(MAKE) _tag TAG=$$NEW
|
||||||
|
|
||||||
minor:
|
minor:
|
||||||
@NEW=v$(_MAJ).$(shell expr $(_MIN) + 1).0; \
|
@NEW=v$(_MAJ).$(shell expr $(_MIN) + 1).0; \
|
||||||
git tag $$NEW && echo "Tagged $$NEW" && $(MAKE) _release TAG=$$NEW
|
git tag $$NEW && echo "Tagged $$NEW" && $(MAKE) _tag TAG=$$NEW
|
||||||
|
|
||||||
major:
|
major:
|
||||||
@NEW=v$(shell expr $(_MAJ) + 1).0.0; \
|
@NEW=v$(shell expr $(_MAJ) + 1).0.0; \
|
||||||
git tag $$NEW && echo "Tagged $$NEW" && $(MAKE) _release TAG=$$NEW
|
git tag $$NEW && echo "Tagged $$NEW" && $(MAKE) _tag TAG=$$NEW
|
||||||
|
|
||||||
_release:
|
_tag:
|
||||||
git push origin $(TAG)
|
git push origin $(TAG)
|
||||||
tea releases create --tag $(TAG) --title $(TAG)
|
|
||||||
|
|||||||
+4
-4
@@ -354,11 +354,11 @@ func TestAllFactsForNode_QueryContainsCertname(t *testing.T) {
|
|||||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
receivedQuery = r.URL.Query().Get("query")
|
receivedQuery = r.URL.Query().Get("query")
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
json.NewEncoder(w).Encode([]fact{})
|
_ = json.NewEncoder(w).Encode([]fact{})
|
||||||
}))
|
}))
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
|
|
||||||
allFactsForNode(srv.URL+"/pdb/query/v4/facts", "mynode.example.com")
|
_, _ = allFactsForNode(srv.URL+"/pdb/query/v4/facts", "mynode.example.com")
|
||||||
if !strings.Contains(receivedQuery, "mynode.example.com") {
|
if !strings.Contains(receivedQuery, "mynode.example.com") {
|
||||||
t.Fatalf("expected certname in query, got: %s", receivedQuery)
|
t.Fatalf("expected certname in query, got: %s", receivedQuery)
|
||||||
}
|
}
|
||||||
@@ -405,10 +405,10 @@ func TestRun_AllFacts_PrintsSortedByName(t *testing.T) {
|
|||||||
cfg := config{PuppetDBURL: srv.URL + "/pdb/query/v4/facts", RoleFact: "enc_role"}
|
cfg := config{PuppetDBURL: srv.URL + "/pdb/query/v4/facts", RoleFact: "enc_role"}
|
||||||
err := run(cfg, "node1", "", "", "", false, false, false, false, false, false, true)
|
err := run(cfg, "node1", "", "", "", false, false, false, false, false, false, true)
|
||||||
|
|
||||||
w.Close()
|
_ = w.Close()
|
||||||
os.Stdout = old
|
os.Stdout = old
|
||||||
var buf strings.Builder
|
var buf strings.Builder
|
||||||
io.Copy(&buf, r)
|
_, _ = io.Copy(&buf, r)
|
||||||
out := buf.String()
|
out := buf.String()
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user