Skip to content

Commit

Permalink
Merge pull request #86 from Think-iT-Labs/release-0.1.5d
Browse files Browse the repository at this point in the history 
Release 0.1.5
  • Loading branch information
@carslen
carslen authored Feb 21, 2023
2 parents 3c733f6 + 4858c43 commit 5ad2488
Show file tree
Hide file tree
Showing 73 changed files with 800 additions and 250 deletions.
97 changes: 16 additions & 81 deletions .github/workflows/build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,41 @@ on:
- '[0-9]+.[0-9]+.[0-9]+'
release:
types:
- released
- published
pull_request:
paths-ignore:
- 'charts/**'
- 'docs/**'
- '**/*.md'
branches:
- '*'
workflow_dispatch:

jobs:
secret-presence:
runs-on: ubuntu-latest
outputs:
CXNG_GHCR_PAT: ${{ steps.secret-presence.outputs.CXNG_GHCR_PAT }}
ORG_VERACODE_API_ID: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_ID }}
ORG_VERACODE_API_KEY: ${{ steps.secret-presence.outputs.ORG_VERACODE_API_KEY }}
SONAR_TOKEN: ${{ steps.secret-presence.outputs.SONAR_TOKEN }}
steps:
-
name: Check whether secrets exist
id: secret-presence
run: |
[ ! -z "${{ secrets.CXNG_GHCR_PAT }}" ] && echo "::set-output name=CXNG_GHCR_PAT::true"
[ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "::set-output name=ORG_VERACODE_API_ID::true"
[ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "::set-output name=ORG_VERACODE_API_KEY::true"
[ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
exit 0
verify-formatting:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v3.3.0
with:
fetch-depth: 0
-
name: Set up JDK 11
uses: actions/setup-java@v3.5.1
uses: actions/setup-java@v3.10.0
with:
java-version: '11'
distribution: 'adopt'
Expand All @@ -64,23 +62,16 @@ jobs:
# Set-Up
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v3.3.0
with:
fetch-depth: 0
-
name: Set up JDK 11
uses: actions/setup-java@v3.5.1
uses: actions/setup-java@v3.10.0
with:
java-version: '11'
distribution: 'adopt'
cache: 'maven'
-
name: Init git submodule
run: git submodule update --init
-
name: Build edc with Gradle to get specific snapshot
run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
working-directory: edc
-
name: Cache SonarCloud packages
uses: actions/cache@v3
Expand All @@ -102,30 +93,22 @@ jobs:
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.coverage.jacoco.xmlReportPaths=${GITHUB_WORKSPACE}/edc-tests/target/site/jacoco-aggregate/jacoco.xml \
-Dsonar.verbose=true
build-extensions:
runs-on: ubuntu-latest
needs: [ secret-presence, verify-formatting ]
steps:
# Set-Up
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v3.3.0
-
name: Set up JDK 11
uses: actions/setup-java@v3.5.1
uses: actions/setup-java@v3.10.0
with:
java-version: '11'
distribution: 'adopt'
cache: 'maven'
# Build
-
name: Init git submodule
run: git submodule update --init
-
name: Build edc with Gradle to get specific snapshot
run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
working-directory: edc
-
name: Build Extensions
run: |-
Expand All @@ -148,7 +131,7 @@ jobs:
# Set-Up
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v3.3.0
-
name: Login to GitHub Container Registry
if: |
Expand All @@ -160,19 +143,12 @@ jobs:
password: ${{ secrets.CXNG_GHCR_PAT }}
-
name: Set up JDK 11
uses: actions/setup-java@v3.5.1
uses: actions/setup-java@v3.10.0
with:
java-version: '11'
distribution: 'adopt'
cache: 'maven'
# Build
-
name: Init git submodule
run: git submodule update --init
-
name: Build edc with Gradle to get specific snapshot
run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
working-directory: edc
-
name: Build Controlplane
run: |-
Expand All @@ -195,7 +171,7 @@ jobs:
type=sha
-
name: Build Docker Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
file: edc-controlplane/${{ matrix.name }}/src/main/docker/Dockerfile
Expand All @@ -206,23 +182,6 @@ jobs:
${{ (needs.secret-presence.outputs.CXNG_GHCR_PAT && github.event_name != 'pull_request' && 'true') || 'false' }}
tags: ${{ steps.edc_controlplane_meta.outputs.tags }}
labels: ${{ steps.edc_controlplane_meta.outputs.labels }}
-
name: Veracode Upload And Scan
uses: veracode/[email protected]
if: |
needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY && contains('
refs/heads/develop
refs/heads/release/
refs/tags/
refs/heads/main', github.ref)
continue-on-error: true
with:
appname: product-edc/${{ matrix.name }}
createprofile: true
version: ${{ github.ref }}-${{ github.sha }}
filepath: edc-controlplane/${{ matrix.name }}/target/${{ matrix.name }}.jar
vid: ${{ secrets.ORG_VERACODE_API_ID }}
vkey: ${{ secrets.ORG_VERACODE_API_KEY }}

build-dataplane:
runs-on: ubuntu-latest
Expand All @@ -237,7 +196,7 @@ jobs:
# Set-Up
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v3.3.0
-
name: Login to GitHub Container Registry
if: |
Expand All @@ -249,19 +208,12 @@ jobs:
password: ${{ secrets.CXNG_GHCR_PAT }}
-
name: Set up JDK 11
uses: actions/setup-java@v3.5.1
uses: actions/setup-java@v3.10.0
with:
java-version: '11'
distribution: 'adopt'
cache: 'maven'
# Build
-
name: Init git submodule
run: git submodule update --init
-
name: Build edc with Gradle to get specific snapshot
run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
working-directory: edc
-
name: Build Dataplane
run: |-
Expand All @@ -284,7 +236,7 @@ jobs:
type=sha
-
name: Build Docker Image
uses: docker/build-push-action@v3
uses: docker/build-push-action@v4
with:
context: .
file: edc-dataplane/${{ matrix.name }}/src/main/docker/Dockerfile
Expand All @@ -295,20 +247,3 @@ jobs:
${{ (needs.secret-presence.outputs.CXNG_GHCR_PAT && github.event_name != 'pull_request' && 'true') || 'false' }}
tags: ${{ steps.edc_dataplane_meta.outputs.tags }}
labels: ${{ steps.edc_dataplane_meta.outputs.labels }}
-
name: Veracode Upload And Scan
uses: veracode/[email protected]
if: |
needs.secret-presence.outputs.ORG_VERACODE_API_ID && needs.secret-presence.outputs.ORG_VERACODE_API_KEY && contains('
refs/heads/develop
refs/heads/release/
refs/tags/
refs/heads/main', github.ref)
continue-on-error: true
with:
appname: product-edc/${{ matrix.name }}
createprofile: true
version: ${{ github.ref }}-${{ github.sha }}
filepath: edc-dataplane/${{ matrix.name }}/target/${{ matrix.name }}.jar
vid: ${{ secrets.ORG_VERACODE_API_ID }}
vkey: ${{ secrets.ORG_VERACODE_API_KEY }}
39 changes: 0 additions & 39 deletions .github/workflows/helm-chart-release.yaml
View file

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/publish-new-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
pull_request:
branches:
- main
- support/*
types:
- closed

Expand Down Expand Up @@ -186,6 +187,7 @@ jobs:
cache: 'maven'
-
name: Merge main back into develop and set new snapshot version
if: github.event.pull_request.base.ref == 'main'
run: |
# Prepare git env
git config user.name "GitHub actions"
Expand Down
Loading

0 comments on commit 5ad2488

Please sign in to comment.