Skip to content
This repository was archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
Merge pull request #57 from dhiltgen/main_ci
Browse files Browse the repository at this point in the history
Wire up CI for post-merge as well
  • Loading branch information
dhiltgen authored Dec 9, 2020
2 parents b5f9bb3 + 6dc82e0 commit 2848b46
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
17 changes: 4 additions & 13 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
name: pull-request
name: pre-and-post-merge

on:
pull_request:
branches: [ main ]
push:
branches: [ main ]

env:
GO_VERSION: "1.15"
Expand Down Expand Up @@ -36,18 +38,7 @@ jobs:
- uses: actions/checkout@v2
name: Check out code into the Go module directory
- name: Setup kind cluster
run: |
set -x
# kind configuration.
cat > kind.yaml <<EOF
apiVersion: kind.x-k8s.io/v1alpha4
kind: Cluster
nodes:
- role: control-plane
- role: worker
EOF
# Create a cluster!
kind create cluster --config kind.yaml
run: kind create cluster --config ./integration/kind-ci.yaml
- name: Run integration tests
run: make integration EXTRA_GO_TEST_FLAGS=-v
- name: Gather integration coverage results
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bin/*
cover*.out
cover.html
cover*.html
8 changes: 8 additions & 0 deletions integration/kind-ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# kind configuration for CI
# Usage:
# kind create cluster --config ./integration/kind-ci.yaml
apiVersion: kind.x-k8s.io/v1alpha4
kind: Cluster
nodes:
- role: control-plane
- role: worker

0 comments on commit 2848b46

Please sign in to comment.