Skip to content

Commit

Permalink
Merge pull request #341 from otaviof/fix-release-action
Browse files Browse the repository at this point in the history
RHTAPINST-186: GitHub Release Action vs. Container Image
  • Loading branch information
openshift-merge-bot[bot] authored Dec 6, 2024
2 parents 183fde2 + bad68cc commit bf1c201
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/actions/buildah/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ inputs:
IMAGE_NAMESPACE:
description: Makefile's IMAGE_NAMESPACE variable
required: false
default: ${{ github.repository_owner }}
IMAGE_REPO_USERNAME:
description: Makefile's IMAGE_REPO_USERNAME variable
required: false
default: ${{ github.actor }}
IMAGE_REPO_PASSWORD:
description: Makefile's IMAGE_REPO_PASSWORD variable
required: false
default: ${{ secrets.GITHUB_TOKEN }}
required: true
tags:
description: Comma-separated list of tags to apply to the image
required: false
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,15 @@ jobs:
- uses: actions/checkout@v4
- uses: ./.github/actions/go

- name: Container Image
uses: ./.github/actions/buildah
with:
tags: "latest,${{ github.ref }}"
#
# TODO(otaviof): In order to build this container image, we need Red Hat
# container registry credentials.
#
# - name: Container Image
# uses: ./.github/actions/buildah
# with:
# tags: "latest,${{ github.ref }}"
# IMAGE_REPO_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

- name: GitHub Release
env:
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ CGO_LDFLAGS ?=
GITHUB_REF_NAME ?= ${GITHUB_REF_NAME:-}
GITHUB_TOKEN ?= ${GITHUB_TOKEN:-}


# Container registry credentials.
IMAGE_REPO_USERNAME ?=
IMAGE_REPO_PASSWORD ?=
Expand Down

0 comments on commit bf1c201

Please sign in to comment.