Skip to content

Commit 3fdf4b0

Browse files
authored
Feature/add scenario route (#654)
* fix Tasks page with viewId to show informational error and create a scenarioId option
1 parent b3bd1f3 commit 3fdf4b0

15 files changed

+127
-265
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ name: Build
33
on:
44
pull_request:
55
branches:
6-
- development
6+
- main
77
push:
8-
branches: [ development, staging ]
8+
branches:
9+
- main
910
release:
1011
types: [ "published" ]
1112
workflow_dispatch:
@@ -41,7 +42,7 @@ jobs:
4142
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
4243
echo ::set-output name=push::false
4344
echo "event is pull_request, not pushing image"
44-
else
45+
else
4546
echo ::set-output name=push::true
4647
echo "event is not pull_request, pushing image"
4748
fi
@@ -54,7 +55,7 @@ jobs:
5455

5556
- name: Login to DockerHub
5657
if: github.event_name != 'pull_request'
57-
uses: docker/login-action@v1
58+
uses: docker/login-action@v1
5859
with:
5960
username: ${{ secrets.DOCKERHUB_USERNAME }}
6061
password: ${{ secrets.DOCKERHUB_PASSWORD }}

package-lock.json

Lines changed: 40 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "steamfitter-ui",
3-
"version": "3.7.4",
3+
"version": "3.8.3",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",

0 commit comments

Comments
 (0)