Skip to content

Commit e391cf7

Browse files
committed
Remove unnecessary sudo chown
1 parent e6713f2 commit e391cf7

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

.github/workflows/pull_request.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@ jobs:
1818
version: v1.32.2
1919
args: --timeout=5m
2020

21-
- name: Change Owner
22-
shell: bash
23-
run: sudo chown -R $(id -u):$(id -g) /usr/local
21+
- name: Check etcd Cache
22+
id: check-etcd-cache
23+
uses: actions/cache@v2
24+
with:
25+
path: ~/go/bin/etcd
26+
key: etcd
2427

25-
- name: Check Kubebuilder Cache
26-
id: check-kubebuilder-cache
28+
- name: Check kube-apiserver Cache
29+
id: check-kube-apiserver-cache
2730
uses: actions/cache@v2
2831
with:
29-
path: /usr/local/kubebuilder/bin
30-
key: kubebuilder
32+
path: ~/go/bin/kube-apiserver
33+
key: kube-apiserver
3134

3235
- name: Install Kubebuilder
33-
if: steps.check-kubebuilder-cache.outputs.cache-hit != 'true'
36+
if: ${{ steps.check-etcd-cache.outputs.cache-hit != 'true' || steps.check-kube-apiserver-cache.outputs.cache-hit != 'true' }}
3437
run: make kubebuilder
3538

3639
- name: Run tests

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ all: manager
2828

2929
# Run tests
3030
test: generate fmt vet manifests
31-
go test ./... -coverprofile cover.out -v
31+
KUBEBUILDER_ASSETS=${GOBIN} go test ./... -coverprofile cover.out -v
3232

3333
# todo: Modify Dockerfile to include the version magic
3434
# Build manager binary
@@ -189,6 +189,5 @@ kubebuilder:
189189
os=$$(go env GOOS) ;\
190190
arch=$$(go env GOARCH) ;\
191191
curl -L https://go.kubebuilder.io/dl/2.3.1/$${os}/$${arch} | tar -xz -C /tmp/ ;\
192-
sudo mv /tmp/kubebuilder_2.3.1_$${os}_$${arch} /usr/local/kubebuilder ;\
193-
export PATH=$PATH:/usr/local/kubebuilder/bin ;\
192+
mv /tmp/kubebuilder_2.3.1_$${os}_$${arch}/bin/* ${GOBIN} ;\
194193
}

0 commit comments

Comments
 (0)