Skip to content

Commit

Permalink
Revert "ci(modules): build and publish modules separately (#426)"
Browse files Browse the repository at this point in the history
This reverts commit 7439c76.
  • Loading branch information
andrewazores committed Jul 19, 2024
1 parent c290c77 commit 9c10058
Show file tree
Hide file tree
Showing 18 changed files with 4 additions and 1,363 deletions.
20 changes: 0 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,6 @@ jobs:
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml') }}
- run: mvn -B -U clean install


build-libcryostat:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0
- uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
- run: cd libcryostat
- uses: actions/cache@v3
with:
path: ~/.m2
key: ${{ runner.os }}-build-${{ hashFiles('**/pom.xml') }}
- run: mvn -B -U clean install

build-cryostat:
needs: [build-core]
runs-on: ubuntu-latest
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/maven-central-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@ name: Publish a new Maven Central release
on:
workflow_call:
inputs:
jdk-version:
description: 'JDK version for build'
required: true
type: string
publish-cmd:
description: 'Command to perform publish'
required: true
type: string
publish-directory:
description: 'Directory to perform publish'
required: true
type: string

jobs:
build:
Expand All @@ -28,11 +20,11 @@ jobs:
- name: Java setup
uses: actions/setup-java@v3
with:
java-version: ${{ inputs.jdk-version }}
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Run a build of the code base before release
run: cd ${{ inputs.publish-directory }} && ./mvnw --batch-mode --no-transfer-progress clean install
run: ./mvnw --batch-mode --no-transfer-progress clean install
# - name: Set release version
# run: ./mvnw --batch-mode --no-transfer-progress versions:set -DnewVersion=${{ github.event.inputs.version }}
- name: Release with JReleaser
Expand Down
19 changes: 1 addition & 18 deletions .github/workflows/push-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- run: mvn -B -U clean verify

get-version:
runs-on: ubuntu-latest
outputs:
Expand All @@ -31,24 +28,10 @@ jobs:
run: |
PROJECT_VERSION="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
echo "project-version=${PROJECT_VERSION}" >> "${GITHUB_OUTPUT}"
publish-core-snapshot:
needs: get-version
uses: ./.github/workflows/maven-central-publish.yml
secrets: inherit
with:
jdk-version: 17
publish-direectory: 'cryostat-core'
publish-cmd: './release-snapshot.sh'
if: ${{ github.repository_owner == 'cryostatio' && endsWith(needs.get-version.outputs.project-version, '-SNAPSHOT') }}


publish-libcryostat-snapshot:
publish-snapshot:
needs: get-version
uses: ./.github/workflows/maven-central-publish.yml
secrets: inherit
with:
jdk-version: 11
publish-direectory: 'libcryostat'
publish-cmd: './release-snapshot.sh'
if: ${{ github.repository_owner == 'cryostatio' && endsWith(needs.get-version.outputs.project-version, '-SNAPSHOT') }}
14 changes: 1 addition & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,9 @@ on:
# required: true

jobs:

publish-release-core:
uses: ./.github/workflows/maven-central-publish.yml
secrets: inherit
with:
jdk-version: 17
publish-directory: 'cryostat-core'
publish-cmd: './release.sh'
if: ${{ github.repository_owner == 'cryostatio' }}

publish-release-libcryostat:
publish-release:
uses: ./.github/workflows/maven-central-publish.yml
secrets: inherit
with:
jdk-version: 11
publish-directory: 'libcryostat'
publish-cmd: './release.sh'
if: ${{ github.repository_owner == 'cryostatio' }}
98 changes: 0 additions & 98 deletions cryostat-core/.mvn/wrapper/MavenWrapperDownloader.java

This file was deleted.

Binary file removed cryostat-core/.mvn/wrapper/maven-wrapper.jar
Binary file not shown.
18 changes: 0 additions & 18 deletions cryostat-core/.mvn/wrapper/maven-wrapper.properties

This file was deleted.

Loading

0 comments on commit 9c10058

Please sign in to comment.