Skip to content

Commit

Permalink
uncomment build jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew committed Aug 9, 2024
1 parent 55895b8 commit f1ba07e
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 36 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/minimal-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ jobs:
- uses: actions/checkout@v4
- run: sh .github/workflows/scripts/verify_minimal_app_releasable.sh
name: Verify minimal app is in a state to be released on merge
# build:
# name: build image
# if: github.ref != 'refs/heads/main'
# runs-on: ubuntu-latest
# defaults:
# run:
# shell: bash
# working-directory: ${{ env.WORKING_DIR }}
# steps:
# - uses: actions/checkout@v4
# - uses: actions/setup-java@v3
# with:
# java-version: "${{ env.JAVA_VERSION }}"
# distribution: "temurin"
# - run: mvn --batch-mode --update-snapshots verify
# name: build image
build:
name: build image
if: github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
defaults:
run:
shell: bash
working-directory: ${{ env.WORKING_DIR }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
java-version: "${{ env.JAVA_VERSION }}"
distribution: "temurin"
- run: mvn --batch-mode --update-snapshots verify
name: build image

release:
if: github.ref == 'refs/heads/main'
Expand Down
32 changes: 12 additions & 20 deletions .github/workflows/operator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

# - run: |
# VERSION=$(make --no-print-directory -C operator get-version)
# TAG_NAME=$(make --no-print-directory -C operator get-tag)
# echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
# echo "TAG_NAME=$TAG_NAME" >> "$GITHUB_OUTPUT"
# cat $GITHUB_OUTPUT
# id: naming-selector
# name: generate names for artifacts
- run: sh .github/workflows/scripts/verify_operator_releasable.sh
name: Verify operator is in a state to be released on merge
# build:
# if: github.ref != 'refs/heads/main'
# runs-on: ubuntu-latest
# defaults:
# run:
# shell: bash
# working-directory: ${{ env.WORKING_DIR }}
# steps:
# - uses: actions/checkout@v4
# - run: make prep-release
# name: generate release files

build:
if: github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
defaults:
run:
shell: bash
working-directory: ${{ env.WORKING_DIR }}
steps:
- uses: actions/checkout@v4
- run: make prep-release
name: generate release files

release:
if: github.ref == 'refs/heads/main'
Expand Down

0 comments on commit f1ba07e

Please sign in to comment.