Skip to content

Commit

Permalink
Merge pull request #37 from jflo/gha_permmissioned
Browse files Browse the repository at this point in the history
more magic in the buildfile
  • Loading branch information
jflo authored Jan 24, 2024
2 parents d89d1c9 + e34bd4a commit 74f15ab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
matrix:
platform:
- ubuntu-22.04
- [self-hosted, ARM64, macOS]
- [self-hosted, ARM64]
runs-on: ${{ matrix.platform }}
steps:
- name: Prepare
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
matrix:
platform:
- ubuntu-22.04
- [self-hosted, ARM64, macOS]
- [self-hosted, ARM64]
runs-on: ${{ matrix.platform }}
steps:
- name: Prepare
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- name: build image
uses: gradle/[email protected]
with:
arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ env.nightly-tag }}
arguments: distDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Pbranch=${{ github.ref_name }}
- name: install goss
run: |
mkdir -p docker/reports
Expand All @@ -81,7 +81,7 @@ jobs:
env:
architecture: ${{ steps.prep.outputs.ARCH }}
with:
arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Prelease.releaseVersion=${{ env.nightly-tag }}
arguments: testDocker -PdockerOrgName=${{ secrets.DOCKER_ORG }} -Pbranch=${{ github.ref_name }}
- name: Login to DockerHub
uses: docker/login-action@v2
with:
Expand All @@ -91,7 +91,7 @@ jobs:
- name: publish
env:
architecture: ${{ steps.prep.outputs.ARCH }}
run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ github.repository }} -Prelease.releaseVersion=${{ env.nightly-tag }}
run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ github.repository }} -Pbranch=${{ github.ref_name }}
multiArch:
needs: buildDocker
runs-on: ubuntu-22.04
Expand All @@ -112,5 +112,5 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: multi-arch docker
run: ./gradlew manifestDocker -PdockerOrgName=${{ github.repository }} -Prelease.releaseVersion=${{ env.nightly-tag }}
run: ./gradlew manifestDocker -PdockerOrgName=${{ github.repository }} -Pbranch=${{ github.ref_name }}

0 comments on commit 74f15ab

Please sign in to comment.