Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: use workspaces to make api changes easier #635

Merged
merged 7 commits into from
May 13, 2024
Merged

chore: use workspaces to make api changes easier #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
001c80d
chore: use workspaces to make api changes easier
bacherfl May 8, 2024
e00511a
copy apis folder before go work init
bacherfl May 13, 2024
6b2bfbb
copy apis folder before go work init
bacherfl May 13, 2024
cd7b86b
fix go work init command
bacherfl May 13, 2024
6b008f8
change order of copy commands
bacherfl May 13, 2024
da66dd0
init workspace
bacherfl May 13, 2024
4050820
init workspace before executing tests
bacherfl May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/pr-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Workspace Init
run: make workspace-init

- name: Unit Test
run: make unit-test

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ jobs:
with:
go-version: ${{ env.DEFAULT_GO_VERSION }}
- run: |
make workspace-init
go mod tidy
make controller-gen
IMG=ghcr.io/open-feature/open-feature-operator:${{ needs.release-please.outputs.release_tag_name }} make helm-package
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ WORKDIR /workspace
# Copy the Go Modules manifests
COPY go.mod go.mod
COPY go.sum go.sum
# cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
RUN go mod download

# Copy the go source
COPY main.go main.go
Expand All @@ -16,6 +13,10 @@ COPY webhooks/ webhooks/
COPY controllers/ controllers/
COPY common/ common/

# cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
RUN go work init . ./apis && go mod download

ARG TARGETOS
ARG TARGETARCH

Expand Down
12 changes: 12 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ CHART_VERSION=v0.5.4# x-release-please-version
ENVTEST_K8S_VERSION = 1.26.1
WAIT_TIMEOUT_SECONDS?=60

ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
GOBIN=$(shell go env GOPATH)/bin
Expand Down Expand Up @@ -256,3 +258,13 @@ install-mockgen:
go install github.com/golang/mock/mockgen@v1.6.0
mockgen: install-mockgen
mockgen -source=controllers/common/flagd-injector.go -destination=controllers/common/mock/flagd-injector.go -package=commonmock

workspace-init: workspace-clean
go work init
$(foreach module, $(ALL_GO_MOD_DIRS), go work use $(module);)

workspace-update:
$(foreach module, $(ALL_GO_MOD_DIRS), go work use $(module);)

workspace-clean:
rm -rf go.work
Loading