Skip to content

Commit

Permalink
Merge pull request #155 from chain4travel/suite
Browse files Browse the repository at this point in the history
Suite
  • Loading branch information
mo-c4t authored Aug 30, 2023
2 parents 00fc732 + d00ba25 commit 63ad4ae
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
20 changes: 19 additions & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,19 @@ jobs:
id: setDefaults
run: |
DOCKER_IMAGE_NAME="europe-west3-docker.pkg.dev/pwk-c4t-dev/internal-camino-dev/camino-suite"
echo "create_tag=false" >> $GITHUB_OUTPUT
if [[ "${{ github.ref }}" == "refs/heads/c4t" ]]; then
echo "docker_image=$DOCKER_IMAGE_NAME:stage" >> $GITHUB_OUTPUT
echo "build_env=stage" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref }}" == "refs/heads/suite-c4t" ]]; then
echo "docker_image=$DOCKER_IMAGE_NAME:stage" >> $GITHUB_OUTPUT
echo "build_env=stage" >> $GITHUB_OUTPUT
CURRENT_TAG=$(git describe --abbrev=0 --tags)
if [[ $CURRENT_TAG == *"-rc"* ]]; then
TAG_TEMP=$(echo "$CURRENT_TAG"|awk -F'-rc' -v OFS='-rc' '{$2=sprintf("%1d",++$2)}7')
echo "tag=$TAG_TEMP" >> $GITHUB_OUTPUT
echo "create_tag=true" >> $GITHUB_OUTPUT
fi
elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
echo "docker_image=$DOCKER_IMAGE_NAME:dev" >> $GITHUB_OUTPUT
echo "build_env=dev" >> $GITHUB_OUTPUT
Expand All @@ -50,6 +56,18 @@ jobs:
echo "build_env=dev" >> $GITHUB_OUTPUT
fi
- name: Create tag
if: ${{ (github.ref == 'refs/heads/suite-c4t') && (github.event_name == 'push') && (steps.setDefaults.outputs.create_tag == 'true') }}
uses: actions/github-script@v5
with:
script: |
github.rest.git.createRef({
owner: context.repo.owner,
repo: context.repo.repo,
ref: 'refs/tags/${{ steps.setDefaults.outputs.tag }}',
sha: context.sha
})
- name: Cloud authentication
if: github.event_name == 'push'
id: auth
Expand Down
3 changes: 2 additions & 1 deletion src/views/settings/Links.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

Check warning on line 1 in src/views/settings/Links.tsx

View workflow job for this annotation

GitHub Actions / yarn-build

Delete `⏎`
import React, { useEffect, useState } from 'react'

import Box from '@mui/material/Box'
Expand Down Expand Up @@ -52,4 +53,4 @@ export default function Links() {
</Tabs>
</Box>
)
}
}

Check warning on line 56 in src/views/settings/Links.tsx

View workflow job for this annotation

GitHub Actions / yarn-build

Insert `⏎`

0 comments on commit 63ad4ae

Please sign in to comment.