Skip to content

Commit

Permalink
Bump GitHub Action workflows
Browse files Browse the repository at this point in the history
[no ci]
  • Loading branch information
slominskir committed Jun 13, 2024
1 parent 5b486d1 commit 707c917
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/cd.yml → .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,22 @@ on:

jobs:
release:
uses: jeffersonlab/java-workflows/.github/workflows/gh-release.yml@v1
uses: jeffersonlab/java-workflows/.github/workflows/gh-release.yaml@v2
with:
files: build/libs/myquery.war
secrets: inherit

docker_publish:
needs:
- release
uses: jeffersonlab/container-workflows/.github/workflows/docker-publish.yml@v1
uses: jeffersonlab/container-workflows/.github/workflows/docker-publish.yaml@v2
with:
semvertag: ${{ needs.release.outputs.semvertag }}
secrets: inherit

epicswebtest_deploy:
needs:
- release
uses: jeffersonlab/general-workflows/.github/workflows/jlab-deploy-app.yml@v1
uses: jeffersonlab/general-workflows/.github/workflows/jlab-deploy-app.yaml@v2
with:
app: myquery
env: epicswebtest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml → .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:

jobs:
unit:
uses: jeffersonlab/java-workflows/.github/workflows/unit-ci.yml@v1
uses: jeffersonlab/java-workflows/.github/workflows/unit-ci.yaml@v2
integration:
needs:
- unit
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dd.yml → .github/workflows/dd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ on:
- main
paths:
- README.md
- .github/workflows/dd.yml
- .github/workflows/dd.yaml
jobs:
description:
uses: jeffersonlab/container-workflows/.github/workflows/docker-description.yml@v1
uses: jeffersonlab/container-workflows/.github/workflows/docker-description.yaml@v2
secrets: inherit
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# myquery [![CI](https://github.com/JeffersonLab/myquery/actions/workflows/ci.yml/badge.svg)](https://github.com/JeffersonLab/myquery/actions/workflows/ci.yml) [![Docker](https://img.shields.io/docker/v/jeffersonlab/myquery?sort=semver&label=DockerHub)](https://hub.docker.com/r/jeffersonlab/myquery)
# myquery [![CI](https://github.com/JeffersonLab/myquery/actions/workflows/ci.yaml/badge.svg)](https://github.com/JeffersonLab/myquery/actions/workflows/ci.yaml) [![Docker](https://img.shields.io/docker/v/jeffersonlab/myquery?sort=semver&label=DockerHub)](https://hub.docker.com/r/jeffersonlab/myquery)
The myquery web service provides a simple query interface to the Jefferson Lab MYA archiver via [jmyapi](https://github.com/JeffersonLab/jmyapi).

![Screenshot](https://github.com/JeffersonLab/myquery/raw/main/Screenshot.png?raw=true "Screenshot")
Expand Down Expand Up @@ -94,10 +94,10 @@ gradlew integrationTest

## Release
1. Bump the version number in the VERSION file and commit and push to GitHub (using [Semantic Versioning](https://semver.org/)).
2. The [CD](https://github.com/JeffersonLab/myquery/blob/main/.github/workflows/cd.yml) GitHub Action should run automatically invoking:
- The [Create release](https://github.com/JeffersonLab/java-workflows/blob/main/.github/workflows/gh-release.yml) GitHub Action to tag the source and create release notes summarizing any pull requests. Edit the release notes to add any missing details. A war file artifact is attached to the release.
- The [Publish docker image](https://github.com/JeffersonLab/container-workflows/blob/main/.github/workflows/docker-publish.yml) GitHub Action to create a new demo Docker image, and bump the [compose.override.yaml](https://github.com/JeffersonLab/myquery/blob/main/compose.override.yaml) to use the new image.
- The [Deploy to JLab](https://github.com/JeffersonLab/general-workflows/blob/main/.github/workflows/jlab-deploy-app.yml) GitHub Action to deploy to the JLab test environment.
2. The [CD](https://github.com/JeffersonLab/myquery/blob/main/.github/workflows/cd.yaml) GitHub Action should run automatically invoking:
- The [Create release](https://github.com/JeffersonLab/java-workflows/blob/main/.github/workflows/gh-release.yaml) GitHub Action to tag the source and create release notes summarizing any pull requests. Edit the release notes to add any missing details. A war file artifact is attached to the release.
- The [Publish docker image](https://github.com/JeffersonLab/container-workflows/blob/main/.github/workflows/docker-publish.yaml) GitHub Action to create a new demo Docker image.
- The [Deploy to JLab](https://github.com/JeffersonLab/general-workflows/blob/main/.github/workflows/jlab-deploy-app.yaml) GitHub Action to deploy to the JLab test environment.

## Deploy
The deploy to JLab's epicswebtest is handled automatically via the release workflow.
Expand Down
2 changes: 1 addition & 1 deletion compose.override.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
services:
myquery:
image: jeffersonlab/myquery:6.1.3
image: jeffersonlab/myquery:latest

0 comments on commit 707c917

Please sign in to comment.