diff --git a/.github/workflows/merge-gradle.yml b/.github/workflows/merge-gradle.yml index 2d3b8ad8e30..1d8f6d39a04 100644 --- a/.github/workflows/merge-gradle.yml +++ b/.github/workflows/merge-gradle.yml @@ -7,7 +7,7 @@ name: "Publish JavaDoc" on: push: - branches: [master] + branches: [main] permissions: contents: read @@ -22,9 +22,9 @@ jobs: steps: - uses: actions/checkout@v3 name: Checkout source - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} - uses: gradle/wrapper-validation-action@v1 - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} - name: Set up JDK 11 uses: actions/setup-java@v3 with: @@ -32,19 +32,19 @@ jobs: distribution: 'temurin' # Build first - lombok & other pre-processing may be needed. safer... - name: build - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} run: './gradlew -x test -x javadoc' - name: javadoc - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} run: './gradlew aggregateJavadoc' - name: publish - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} uses: JamesIves/github-pages-deploy-action@v4.4.0 with: branch: gh-pages folder: build/docs/javadoc - name: Upload Log of any dependency failures - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} uses: actions/upload-artifact@v3 with: name: Dependency Analysis Report (on failure) diff --git a/.github/workflows/merge-maven.yml b/.github/workflows/merge-maven.yml index 9fb2c6434e8..a843611b287 100644 --- a/.github/workflows/merge-maven.yml +++ b/.github/workflows/merge-maven.yml @@ -1,13 +1,13 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright Contributors to the ODPi Egeria project. -name: "Merge master)" +name: "Merge main)" # Trigger after code is merged. only on main repo # - does not run on modification (may be just text) on: push: - branches: [master,egeria-release-*,feature-*] + branches: [main,egeria-release-*,feature-*] permissions: contents: read @@ -15,7 +15,7 @@ permissions: jobs: build: runs-on: ubuntu-latest - name: "Merge master" + name: "Merge main" if: startsWith(github.repository,'odpi/') steps: - uses: actions/checkout@v3 @@ -35,9 +35,9 @@ jobs: # Keys must be known to maven central - require broad publishing gpg-private-key: ${{ secrets.OSSRH_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - # Build and publish - but only for master + # Build and publish - but only for main - name: Build with Maven (Publish snapshots to maven central + docker) - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} # See https://github.com/actions/toolkit/issues/231 requires parms using . to be quoted run: 'mvn -B -DuseMavenCentral clean deploy' # Needed for publishing -- note we push to a staging area, login to oss.sonatype.org to @@ -46,9 +46,9 @@ jobs: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSPHRASE }} - # Build and publish - but only for master + # Build and publish - but only for main - name: Build with Maven (no snapshots / docker published) - if: ${{ github.repository != 'odpi/egeria' || github.ref != 'refs/heads/master'}} + if: ${{ github.repository != 'odpi/egeria' || github.ref != 'refs/heads/main'}} run: mvn -B clean verify # -- - name: Set up Docker Buildx @@ -74,12 +74,12 @@ jobs: echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV # Publish container images(egeria) to quay.io and docker.io - name: Copy the distribution content to be used in docker copy command - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} run: | mkdir -p ./open-metadata-resources/open-metadata-deployment/docker/egeria/target/assembly cp -r open-metadata-distribution/open-metadata-assemblies/target/egeria-${{ env.VERSION }}-distribution/egeria-omag-${{ env.VERSION }}/. open-metadata-resources/open-metadata-deployment/docker/egeria/target/assembly - name: Build and push(egeria) to quay.io and docker.io - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} uses: docker/build-push-action@v3 with: push: true @@ -88,7 +88,7 @@ jobs: platforms: linux/amd64,linux/arm64 # Publish container images(egeria-configure) to quay.io and docker.io - name: Build and push(egeria-configure) to quay.io and docker.io - if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/master'}} + if: ${{ github.repository == 'odpi/egeria' && github.ref == 'refs/heads/main'}} uses: docker/build-push-action@v3 with: push: true diff --git a/.github/workflows/pr-codeql.yml b/.github/workflows/pr-codeql.yml index 3f2ddb058b5..bd907d3dd3c 100644 --- a/.github/workflows/pr-codeql.yml +++ b/.github/workflows/pr-codeql.yml @@ -10,10 +10,10 @@ name: "CodeQL Analysis" on: push: - branches: [master, feature-*, egeria-release-*] + branches: [main, feature-*, egeria-release-*] pull_request: # The branches below must be a subset of the branches above - branches: [master, feature-*, egeria-release-*] + branches: [main, feature-*, egeria-release-*] schedule: - cron: '0 20 * * 0' diff --git a/.github/workflows/pr-gradle.yml b/.github/workflows/pr-gradle.yml index 136988c29d6..cc0e1fc818b 100644 --- a/.github/workflows/pr-gradle.yml +++ b/.github/workflows/pr-gradle.yml @@ -4,7 +4,7 @@ name: "Gradle" on: pull_request: - branches: [master, feature-*, egeria-release-*] + branches: [main, feature-*, egeria-release-*] permissions: contents: read diff --git a/.github/workflows/pr-maven-latest.yml b/.github/workflows/pr-maven-latest.yml index b8b3d557656..600a6b7d886 100644 --- a/.github/workflows/pr-maven-latest.yml +++ b/.github/workflows/pr-maven-latest.yml @@ -4,7 +4,7 @@ name: "Maven - latest release" on: pull_request: - branches: [master, feature-*, egeria-release-*] + branches: [main, feature-*, egeria-release-*] permissions: contents: read diff --git a/.github/workflows/pr-maven-prod.yml b/.github/workflows/pr-maven-prod.yml index ec6bee18420..be082df2b02 100644 --- a/.github/workflows/pr-maven-prod.yml +++ b/.github/workflows/pr-maven-prod.yml @@ -4,7 +4,7 @@ name: "Maven" on: pull_request: - branches: [master, feature-*, egeria-release-*] + branches: [main, feature-*, egeria-release-*] permissions: contents: read diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index f927d203edb..b41fab1543f 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -8,7 +8,7 @@ on: schedule: - cron: '26 9 * * 6' push: - branches: [ "master" ] + branches: [ "main" ] # Also allow for manual invocation for testing workflow_dispatch: