Skip to content

Commit 83a1530

Browse files
authored
Merge pull request #1452 from njhale/fix-image-build
Fix upstream image build
2 parents 3854141 + e29e0a1 commit 83a1530

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

.github/workflows/test-scripts.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,30 @@
1-
name: test-scripts
1+
name: upstream-tests
22
on:
33
pull_request:
44
paths:
5-
- 'scripts/**'
6-
- 'Makefile'
5+
- '**'
6+
- '!doc/contributors/**'
7+
- '!doc/design/**'
78
schedule:
89
- cron: '0 0 * * *' # daily to pick up releases
910
jobs:
11+
image-build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check out the repo
15+
uses: actions/checkout@v2
16+
- name: Build the container image
17+
uses: docker/build-push-action@v1
18+
with:
19+
repository: operator-framework/olm
20+
dockerfile: ./upstream.Dockerfile
21+
push: false
1022
run-local-minikube:
1123
runs-on: ubuntu-latest
1224
steps:
1325
- uses: actions/checkout@v2
1426
- run: |
27+
sudo apt-get install conntrack
1528
curl -sLo minikube "$(curl -sL https://api.github.com/repos/kubernetes/minikube/releases/latest | jq -r '[.assets[] | select(.name == "minikube-linux-amd64")] | first | .browser_download_url')"
1629
chmod +x minikube
1730
sudo mv minikube /bin/

upstream.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ COPY vendor vendor
1515
COPY go.mod go.mod
1616
COPY go.sum go.sum
1717
COPY cmd cmd
18+
COPY util util
1819
COPY test test
1920
RUN make build
2021
RUN make build-util

0 commit comments

Comments
 (0)