Skip to content

Commit

Permalink
Merge branch 'develop' into 'master' for 0.29.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
shauke committed Apr 1, 2021
2 parents 44edfd9 + fa2b104 commit b30bff9
Show file tree
Hide file tree
Showing 441 changed files with 6,249 additions and 4,486 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/azure-devops.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Synchronize develop branch

on:
workflow_dispatch:
push:
branches:
- develop

jobs:
CancelPrevious:
runs-on: ubuntu-latest
steps:
- name: Cancel Old Pipeline
uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Build:
needs: CancelPrevious
if: ${{ github.event.repository.owner.login == 'intershop' }}
runs-on: ubuntu-latest
steps:
- name: Azure Pipelines Action
uses: Azure/pipelines@v1
with:
# Fullyqualified URL to the Azure DevOps organization along with project name(eg, https://dev.azure.com/organization/project-name or https://server.example.com:8080/tfs/DefaultCollection/project-name)
azure-devops-project-url: https://dev.azure.com/ish-pwa-rngrx/intershop-pwa
# Name of the Azure Pipline to be triggered
azure-pipeline-name: Sync
# Paste personal access token of the user as value of secret variable:AZURE_DEVOPS_TOKEN
azure-devops-token: ${{ secrets.AZURE_DEVOPS_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/demo-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
GROUP: ${{ secrets.AZURE_DEMO_RESOURCEGROUP }}
run: |
az webapp config container set --resource-group $GROUP --name $APP --docker-registry-server-user ${{ secrets.DOCKER_REGISTRY_USERNAME }} --docker-registry-server-password ${{ secrets.DOCKER_REGISTRY_PASSWORD }} --docker-custom-image-name $DOCKER_IMAGE_UNIVERSAL || az webapp create --resource-group $GROUP --plan ${{ secrets.AZURE_DEMO_APPSERVICEPLAN }} --name $APP --docker-registry-server-user ${{ secrets.DOCKER_REGISTRY_USERNAME }} --docker-registry-server-password ${{ secrets.DOCKER_REGISTRY_PASSWORD }} --deployment-container-image-name $DOCKER_IMAGE_UNIVERSAL
az webapp config appsettings set -g $GROUP -n $APP --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL ICM_CHANNEL=inSPIRED-inTRONICS_Business-Site THEME=blue\|688dc3 FEATURES=compare,recently,tracking,sentry,advancedVariationHandling,businessCustomerRegistration,quoting,quickorder,punchout,orderTemplates TACTON='${{ secrets.TACTON }}'
az webapp config appsettings set -g $GROUP -n $APP --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL ICM_CHANNEL=inSPIRED-inTRONICS_Business-Site THEME=blue\|688dc3 FEATURES=compare,recently,advancedVariationHandling,businessCustomerRegistration,quoting,quickorder,punchout,orderTemplates TACTON='${{ secrets.TACTON }}'
az webapp deployment container config -g $GROUP -n $APP --enable-cd true
echo "B2B channel: http://$APP.azurewebsites.net"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:

BuildNDeployReports:
needs: [CancelPrevious]
if: ${{ github.event.repository.owner.login == 'intershop' }}
runs-on: ubuntu-latest
environment:
name: PWA Reports
Expand Down
12 changes: 0 additions & 12 deletions .gitlab-ci-get-publish.sh

This file was deleted.

18 changes: 0 additions & 18 deletions .gitlab-ci-housekeeping-environments.sh

This file was deleted.

Loading

0 comments on commit b30bff9

Please sign in to comment.