Skip to content
This repository has been archived by the owner on Jun 10, 2024. It is now read-only.

odpi/egeria#6907 master->main rename #458

Merged
merged 2 commits into from
Oct 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ name: "CodeQL"

on:
push:
branches: [master]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [main]
schedule:
- cron: '0 20 * * 0'

Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/node-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Egeria UI Build

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

jobs:

Expand Down Expand Up @@ -56,21 +56,21 @@ jobs:
password: ${{ secrets.QUAY_IO_ACCESS_TOKEN }}
if: ${{ steps.check.outputs.changed == 'true' && github.event_name == 'push' && github.repository == 'odpi/egeria-ui' }}
# For releases (ie not main) we push the image - but not the latest tag
- name: Build and push (not master merge)
- name: Build and push (not main merge)
id: docker_build_release
uses: docker/build-push-action@v2
if: ${{ steps.check.outputs.changed == 'true' && github.ref != 'refs/heads/master' }}
if: ${{ steps.check.outputs.changed == 'true' && github.ref != 'refs/heads/main' }}
with:
push: ${{ github.event_name == 'push' && github.repository == 'odpi/egeria-ui' }}
tags: odpi/egeria-ui:${{ steps.package-version.outputs.current-version}}, quay.io/odpi/egeria-ui:${{ steps.package-version.outputs.current-version}}
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
# For main code stream we push the image and add the latest tag
- name: Build and push (master merge)
id: docker_build_master
- name: Build and push (main merge)
id: docker_build_main
uses: docker/build-push-action@v2
if: ${{ steps.check.outputs.changed == 'true' && github.ref == 'refs/heads/master' }}
if: ${{ steps.check.outputs.changed == 'true' && github.ref == 'refs/heads/main' }}
with:
push: ${{ github.event_name == 'push' && github.repository == 'odpi/egeria-ui' }}
tags: odpi/egeria-ui:${{ steps.package-version.outputs.current-version }}, odpi/egeria-ui:latest, quay.io/odpi/egeria-ui:${{ steps.package-version.outputs.current-version }}, quay.io/odpi/egeria-ui:latest
Expand All @@ -79,11 +79,11 @@ jobs:
platforms: linux/amd64,linux/arm64
# Note the digest
- name: Image digest (release)
if: ${{ steps.check.outputs.changed == 'true' && github.ref != 'refs/heads/master' }}
if: ${{ steps.check.outputs.changed == 'true' && github.ref != 'refs/heads/main' }}
run: echo ${{ steps.docker_build_release.outputs.digest }}
- name: Image digest (master)
if: ${{ steps.check.outputs.changed == 'true' && github.ref == 'refs/heads/master' }}
run: echo ${{ steps.docker_build_master.outputs.digest }}
- name: Image digest (main)
if: ${{ steps.check.outputs.changed == 'true' && github.ref == 'refs/heads/main' }}
run: echo ${{ steps.docker_build_main.outputs.digest }}
# Save an artifact of the build tree & upload
- name: Create Archive
if: ${{ steps.check.outputs.changed == 'true' }}
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,20 @@ Egeria-UI use GitHub as its dependency provider, this means that all the release
are being pushed to the Github Egeria-UI repository here [2].

```bash
$ git clone https://github.com/odpi/egeria-ui # clone and checkout to master branch
$ git clone https://github.com/odpi/egeria-ui # clone and checkout to main branch
$ vim release-notes.md # add release notes
$ git commit -m "Add release notes"
$ npm version patch # (minor or major) this will create a new commit with the bumped version
# and also a git version tag
$ # `npm publish .` won't be executed since we are using GitHub as a direct dependency
$ git push origin master
$ git push origin master --tags
$ git push origin main
$ git push origin main --tags
$ # the released version will be available at the git version tag or in the
# release page here [1]
```

## Links
[0] - https://github.com/odpi/egeria/tree/master/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/
[0] - https://github.com/odpi/egeria/tree/main/open-metadata-implementation/user-interfaces/ui-chassis/ui-chassis-spring/

[1] - https://github.com/odpi/egeria-api-mocks

Expand Down