diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 183a78c4..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,39 +0,0 @@ ---- -name: Bug Report -about: Create a report to help us improve -title: '' -labels: [ "bug_report", "triage" ] -assignees: '' - ---- - -# Bug Report - -## Describe the Bug -_A clear and concise description of the bug._ - -### Expected Behavior -_A clear and concise description of what you expected to happen._ - -### Observed Behavior -_A clear and concise description of what happened instead._ - -## Steps to Reproduce -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -## Context Information -_Add any other context about the problem here._ - -- Used version [e.g. RegistrationService v1.0.0] -- OS: [e.g. iOS, Windows] -- ... - -## Detailed Description -_If applicable, add screenshots and logs to help explain your problem._ - -## Possible Implementation -_You already know the root cause of the erroneous state and how to fix it? Feel free to share your thoughts._ diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 341f6afa..00000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -blank_issues_enabled: true diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index c39f8307..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: Feature Request -about: Help us with new ideas -title: '' -labels: [ "feature_request", "triage" ] -assignees: '' - ---- - -# Feature Request - -## Which Areas Would Be Affected? -_e.g., build, extension, etc._ - -## Why Is the Feature Desired? -_Are there any requirements?_ - -## Solution Proposal -_If possible, provide a (brief!) solution proposal._ diff --git a/.github/actions/bump-version/action.yml b/.github/actions/bump-version/action.yml deleted file mode 100644 index 54ea4944..00000000 --- a/.github/actions/bump-version/action.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: "Bump version in gradle.properties" -description: "Increments the patch version of the version found in gradle.properties, appends -SNAPSHOT" -inputs: - target_branch: - default: 'main' - description: "Branch on which the version bump is to be done." - required: false - base_version: - description: "The current version, which is to be bumped to the next snapshot" - required: false - -runs: - using: "composite" - steps: - - uses: actions/checkout@v3 - - name: read version from gradle.properties - shell: bash - run: | - # Prepare git env - git config user.name "eclipse-edc-bot" - git config user.email "edc-bot@eclipse.org" - - # checkout target - git fetch origin - git checkout ${{ inputs.target_branch }} - - # use current version from input - baseVersion=${{ inputs.base_version }} - existingVersion=$(grep "version" gradle.properties | awk -F= '{print $2}') - - # read the major, minor, and patch components, consume -SNAPSHOT - IFS=.- read -r RELEASE_VERSION_MAJOR RELEASE_VERSION_MINOR RELEASE_VERSION_PATCH SNAPSHOT<<<"$baseVersion" - INC=0 - # Compute new snapshot version, do not increment snapshot on non-final releases, e.g. -rc1 - if [ -z $SNAPSHOT ]; then - echo "$baseVersion is a final release version, increase patch for next snapshot" - INC=1 - else - echo "$baseVersion is not a final release version (contains \"$SNAPSHOT\"), will not increase patch" - fi - - # construct the new version - newVersion="$RELEASE_VERSION_MAJOR.$RELEASE_VERSION_MINOR.$((RELEASE_VERSION_PATCH+$INC))"-SNAPSHOT - - # replace every occurrence of =$baseVersion with =$newVersion - grep -rlz "$existingVersion" . --exclude=\*.{sh,bin} | xargs sed -i "s/$existingVersion/$newVersion/g" - - echo "Bumped the version from $baseVersion to $newVersion" - - # Commit and push to the desired branch, defaults to 'main' - git add . - git commit --message "Bump version from $baseVersion to $newVersion [skip ci]" - - git push origin ${{ inputs.target_branch }} diff --git a/.github/actions/gradle-setup/action.yml b/.github/actions/gradle-setup/action.yml deleted file mode 100644 index ef053daf..00000000 --- a/.github/actions/gradle-setup/action.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: "Setup Gradle" -description: "Setup Gradle" -runs: - using: "composite" - steps: - - # Install Java and cache MVD Gradle build. - - uses: actions/setup-java@v2 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' \ No newline at end of file diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml deleted file mode 100644 index 00800611..00000000 --- a/.github/actions/run-tests/action.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: "Run tests" -description: "Run tests and archive test results for subsequent publication" -inputs: - command: - required: true - description: "The shell command to run tests" -runs: - using: "composite" - steps: - - name: Run Tests - shell: bash - run: ${{ inputs.command }} - - - name: Upload Test Results - uses: actions/upload-artifact@v3 - if: always() - with: - name: Test Results ${{ github.job }} - path: | - **/test-results/**/*.xml - **/build/reports/jacoco/test/jacocoTestReport.xml diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml deleted file mode 100644 index 92747e6b..00000000 --- a/.github/actions/setup-build/action.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: "Setup Gradle" -description: "Setup Gradle" -runs: - using: "composite" - steps: - - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - - - name: Setup Gradle cache - uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 54547c5f..107ed541 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/gradle-setup + - uses: eclipse-edc/.github/.github/actions/setup-build@main # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -45,4 +45,4 @@ jobs: run: ./gradlew compileJava --no-daemon - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 \ No newline at end of file + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/release-registrationservice.yml b/.github/workflows/release-registrationservice.yml index c2b9d031..a4371030 100644 --- a/.github/workflows/release-registrationservice.yml +++ b/.github/workflows/release-registrationservice.yml @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/bump-version + - uses: eclipse-edc/.github/.github/actions/bump-version@main with: target_branch: "main" base_version: ${{ needs.Prepare-Release.outputs.rs-version }} diff --git a/.github/workflows/trigger_snapshot.yml b/.github/workflows/trigger_snapshot.yml new file mode 100644 index 00000000..e204f933 --- /dev/null +++ b/.github/workflows/trigger_snapshot.yml @@ -0,0 +1,13 @@ +name: "Publish Snapshot Build" + +on: + push: + branches: + - main + workflow_dispatch: + +jobs: + Publish-Snapshot: + # This workflow will abort if the required secrets don't exist + uses: eclipse-edc/.github/.github/workflows/publish-snapshot.yml@main + secrets: inherit diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index a8309c59..223da0a1 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/gradle-setup + - uses: eclipse-edc/.github/.github/actions/setup-build@main - name: Run Checkstyle run: ./gradlew checkstyleMain checkstyleTest checkstyleTestFixtures @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/gradle-setup + - uses: eclipse-edc/.github/.github/actions/setup-build@main - name: Generate OpenAPI definition from code run: ./gradlew resolve @@ -47,7 +47,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/gradle-setup + - uses: eclipse-edc/.github/.github/actions/setup-build@main - name: 'Build package' run: ./gradlew -DuseFsVault="true" build @@ -64,7 +64,7 @@ jobs: timeout-minutes: 10 - name: 'Unit and system tests' - uses: ./.github/actions/run-tests + uses: eclipse-edc/.github/.github/actions/run-tests@main with: command: ./gradlew test timeout-minutes: 10 @@ -84,10 +84,10 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/gradle-setup + - uses: eclipse-edc/.github/.github/actions/setup-build@main - name: Component Tests - uses: ./.github/actions/run-tests + uses: eclipse-edc/.github/.github/actions/run-tests@main with: command: ./gradlew test -DincludeTags="ComponentTest"