Skip to content

Commit 39bd5fc

Browse files
authored
ci: Revert "replace Makefile-based Docker builds with GitHub Action… (#1075)" (#1081)
This reverts commit 854183b. Signed-off-by: James Alseth <james@jalseth.me>
1 parent 4435c65 commit 39bd5fc

File tree

2 files changed

+6
-42
lines changed

2 files changed

+6
-42
lines changed

.github/workflows/pr.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ name: pr
22

33
on: [pull_request]
44

5-
env:
6-
IMAGE: openpolicyagent/conftest
7-
PLATFORMS: linux/amd64,linux/arm64
8-
95
permissions:
106
actions: read
117
checks: none
@@ -74,18 +70,6 @@ jobs:
7470
- name: build
7571
run: make build
7672

77-
- name: setup docker buildx
78-
run: docker buildx create --name conftestbuild --use
79-
80-
- name: Build Docker image
81-
uses: docker/build-push-action@v6
82-
with:
83-
context: .
84-
push: false
85-
tags: |
86-
${{ env.IMAGE }}:latest
87-
platforms: ${{ env.PLATFORMS }}
88-
8973
- name: unit test
9074
run: make test
9175

.github/workflows/release.yaml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ on:
44
push:
55
tags:
66
- 'v*'
7-
env:
8-
IMAGE: openpolicyagent/conftest
9-
PLATFORMS: linux/amd64,linux/arm64
10-
7+
118
jobs:
129
release:
1310
runs-on: ubuntu-latest
@@ -39,27 +36,10 @@ jobs:
3936
- name: setup docker buildx
4037
run: docker buildx create --name conftestbuild --use
4138

42-
- name: Build and push Docker image
43-
uses: docker/build-push-action@v6
44-
with:
45-
context: .
46-
push: true
47-
build-args: |
48-
VERSION=${{ steps.get-version.outputs.VERSION }}
49-
tags: |
50-
${{ env.IMAGE }}:${{ env.VERSION }}
51-
${{ env.IMAGE }}:latest
52-
platforms: ${{ env.PLATFORMS }}
53-
54-
- name: Build and push examples image
55-
uses: docker/build-push-action@v6
56-
with:
57-
context: .
58-
push: true
59-
target: examples
60-
tags: |
61-
${{ env.IMAGE }}:examples
62-
platforms: ${{ env.PLATFORMS }}
39+
- name: push images
40+
env:
41+
VERSION: ${{ steps.get-version.outputs.VERSION }}
42+
run: make push TAG=$VERSION
6343

6444
- name: setup go
6545
uses: actions/setup-go@v4
@@ -72,4 +52,4 @@ jobs:
7252
args: release --clean
7353
version: "~> v1"
7454
env:
75-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)