Skip to content

Commit

Permalink
fixup: ci workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
jeqo committed Aug 23, 2023
1 parent e844a1f commit 746f8c8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
18 changes: 2 additions & 16 deletions .github/workflows/main_push_and_pull_request_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,8 @@ jobs:
java-version: ${{ matrix.java-version }}
distribution: temurin

- name: Read version from properties file
id: read-version
run: |
version=$(grep -oP 'version=\K[^[:space:]]+' gradle.properties)
echo "Version found: $version"
echo "VERSION=$version" >> $GITHUB_ENV
- name: Build with Gradle
run: make build/distributions/tiered-storage-for-apache-kafka-${{ env.VERSION }}.tgz
run: make build

- name: Run integration tests
run: make integration_test
Expand All @@ -58,18 +51,11 @@ jobs:
with:
fetch-depth: 0

- name: Read version from properties file
id: read-version
run: |
version=$(grep -oP 'version=\K[^[:space:]]+' gradle.properties)
echo "Version found: $version"
echo "VERSION=$version" >> $GITHUB_ENV
- name: Download Build Artifacts
uses: actions/download-artifact@v3
with:
name: build-${{ matrix.java-version }}
path: build/distributions/tiered-storage-for-apache-kafka-${{ env.VERSION }}.tgz
path: build/distributions/*.tgz

- name: Display structure of downloaded files
run: ls -R
Expand Down
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
VERSION=0.0.1-SNAPSHOT
VERSION := $(shell grep -oP 'version=\K[^[:space:]]+' gradle.properties)
IMAGE_TAG=aivenoy/kafka:3.3-2022-10-06-tiered-storage-1-ts-2

.PHONY: clean
.PHONY: clean checkstyle build integration_test e2e_test docker_image docker_push

clean:
./gradlew clean

checkstyle:
./gradlew checkstyleMain checkstyleTest checkstyleIntegrationTest

build: build/distributions/tiered-storage-for-apache-kafka-$(VERSION).tgz

build/distributions/tiered-storage-for-apache-kafka-$(VERSION).tgz:
./gradlew build distTar -x integrationTest -x e2e:test

Expand Down

0 comments on commit 746f8c8

Please sign in to comment.