Skip to content

Commit f90f769

Browse files
committed
Merge branch 'github-workflow-cache-debug' into add-test-to-github-workflows
2 parents 7e29e53 + 714ab5d commit f90f769

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

.github/workflows/pull_request.yaml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
with:
1818
go-version: '^1.16'
1919

20-
# - name: Lint
21-
# uses: golangci/golangci-lint-action@v2
22-
# with:
23-
# version: v1.32.2
24-
# args: --timeout=5m
20+
- name: Lint
21+
uses: golangci/golangci-lint-action@v2
22+
with:
23+
version: v1.32.2
24+
args: --timeout=5m
2525

2626
- name: Get Kubebuilder Version
2727
id: get-kubebuilder-version
@@ -52,29 +52,29 @@ jobs:
5252
- name: Install Kubebuilder
5353
run: make kubebuilder
5454

55-
# - name: Run tests
56-
# run: make test
55+
- name: Run tests
56+
run: make test
5757

58-
# - name: Figure out if running fork PR
59-
# id: fork
60-
# run: '["${{ secrets.DOCKER_REGISTRY_TOKEN }}" == ""] && echo "::set-output name=is_fork_pr::true" || echo "::set-output name=is_fork_pr::false"'
58+
- name: Figure out if running fork PR
59+
id: fork
60+
run: '["${{ secrets.DOCKER_REGISTRY_TOKEN }}" == ""] && echo "::set-output name=is_fork_pr::true" || echo "::set-output name=is_fork_pr::false"'
6161

62-
# - name: Docker Login
63-
# uses: docker/login-action@v1
64-
# with:
65-
# registry: ${{ secrets.DOCKER_REGISTRY }}
66-
# username: ${{ secrets.DOCKER_REGISTRY_USER }}
67-
# password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
68-
# if: steps.fork.outputs.is_fork_pr == 'false'
62+
- name: Docker Login
63+
uses: docker/login-action@v1
64+
with:
65+
registry: ${{ secrets.DOCKER_REGISTRY }}
66+
username: ${{ secrets.DOCKER_REGISTRY_USER }}
67+
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
68+
if: steps.fork.outputs.is_fork_pr == 'false'
6969

70-
# - name: Build Docker image
71-
# run: |
72-
# export DOCKER_TAG=pr-${GITHUB_HEAD_REF}
73-
# make docker-build
70+
- name: Build Docker image
71+
run: |
72+
export DOCKER_TAG=pr-${GITHUB_HEAD_REF}
73+
make docker-build
7474
75-
# - name: Push Docker image
76-
# run: |
77-
# # pull request images are prefixed with 'pr' to prevent them from overriding released images
78-
# export DOCKER_TAG=pr-${GITHUB_HEAD_REF}
79-
# make docker-push
80-
# if: steps.fork.outputs.is_fork_pr == 'false'
75+
- name: Push Docker image
76+
run: |
77+
# pull request images are prefixed with 'pr' to prevent them from overriding released images
78+
export DOCKER_TAG=pr-${GITHUB_HEAD_REF}
79+
make docker-push
80+
if: steps.fork.outputs.is_fork_pr == 'false'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ install-configmap-sidecars:
184184
crd-cwnp-for-testing:
185185
curl https://raw.githubusercontent.com/metal-stack/firewall-controller/master/config/crd/bases/metal-stack.io_clusterwidenetworkpolicies.yaml -o external/test/crd-clusterwidenetworkpolicy.yaml
186186

187-
KUBEBUILDER_VERSION:=2.3.1
187+
KUBEBUILDER_VERSION:=2.3.2
188188
kubebuilder:
189189
ifeq (,$(wildcard ~/.kubebuilder/${KUBEBUILDER_VERSION}))
190190
{ \

0 commit comments

Comments
 (0)