Skip to content

Commit

Permalink
odpi#6907 master->main rename
Browse files Browse the repository at this point in the history
Signed-off-by: Nigel Jones <[email protected]>
  • Loading branch information
planetf1 committed Oct 20, 2022
1 parent aa44bd7 commit bc3f754
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 23 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/merge-gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: "Publish JavaDoc"

on:
push:
branches: [master]
branches: [main]

permissions:
contents: read
Expand All @@ -22,29 +22,29 @@ 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:
java-version: '11'
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/[email protected]
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)
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/merge-maven.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# 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

jobs:
build:
runs-on: ubuntu-latest
name: "Merge master"
name: "Merge main"
if: startsWith(github.repository,'odpi/')
steps:
- uses: actions/checkout@v3
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: "Gradle"

on:
pull_request:
branches: [master, feature-*, egeria-release-*]
branches: [main, feature-*, egeria-release-*]

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-maven-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: "Maven - latest release"

on:
pull_request:
branches: [master, feature-*, egeria-release-*]
branches: [main, feature-*, egeria-release-*]

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-maven-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: "Maven"

on:
pull_request:
branches: [master, feature-*, egeria-release-*]
branches: [main, feature-*, egeria-release-*]

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
schedule:
- cron: '26 9 * * 6'
push:
branches: [ "master" ]
branches: [ "main" ]
# Also allow for manual invocation for testing
workflow_dispatch:

Expand Down

0 comments on commit bc3f754

Please sign in to comment.