diff --git a/.github/workflows/cypress.yml b/.github/workflows/automation-tests.yml similarity index 84% rename from .github/workflows/cypress.yml rename to .github/workflows/automation-tests.yml index 1819502f68..97572ad257 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/automation-tests.yml @@ -43,8 +43,8 @@ jobs: - name: Run Docker Image run: nohup docker run --rm -p 5000:5000 ombi & - # - name: Run Wiremock Plex - # run: nohup docker run -it --rm -p 32400:8080 --name wiremock wiremock/wiremock:2.35.0 + - name: Run Wiremock + run: nohup docker run --rm -p 32400:8080 --name wiremock wiremock/wiremock:2.35.0 & - name: Sleep for server to start run: sleep 20 @@ -61,7 +61,7 @@ jobs: # nohup dotnet run --project ./src/Ombi -- --host http://*:3577 & - name: Cypress Tests - uses: cypress-io/github-action@v2.8.2 + uses: cypress-io/github-action@v4 with: record: true browser: chrome @@ -73,3 +73,9 @@ jobs: env: CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Stop Docker + if: always() + run: | + docker ps -q | xargs -I {} docker logs {} + docker container kill $(docker ps -q) \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9dfe311bca..f7ec025f00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -106,7 +106,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.x' + dotnet-version: '6.0.x' - uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.x' diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 07f8a1a2b3..f068794be7 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -1,47 +1,47 @@ -name: 'Chromatic' +# name: 'Chromatic' -# Event for the workflow -on: - push: - workflow_dispatch: +# # Event for the workflow +# on: +# push: +# workflow_dispatch: -# List of jobs -jobs: - storybook-build: - # Operating System - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - with: - fetch-depth: 0 +# # List of jobs +# jobs: +# storybook-build: +# # Operating System +# runs-on: ubuntu-latest +# steps: +# - name: Checkout repository +# uses: actions/checkout@v2 +# with: +# fetch-depth: 0 - - name: NodeModules Cache - uses: actions/cache@v2 - with: - path: '**/node_modules' - key: node_modules-${{ hashFiles('**/yarn.lock') }} +# - name: NodeModules Cache +# uses: actions/cache@v2 +# with: +# path: '**/node_modules' +# key: node_modules-${{ hashFiles('**/yarn.lock') }} - - name: Install dependencies - working-directory: ./src/Ombi/ClientApp - run: yarn +# - name: Install dependencies +# working-directory: ./src/Ombi/ClientApp +# run: yarn - - name: Publish to Chromatic - if: github.ref != 'refs/heads/master' - uses: chromaui/action@v1 - with: - projectToken: 7c47e1a1a4bd - exitZeroOnChanges: true - workingDir: ./src/Ombi/ClientApp - buildScriptName: storybookbuild - exitOnceUploaded: true +# - name: Publish to Chromatic +# if: github.ref != 'refs/heads/master' +# uses: chromaui/action@v1 +# with: +# projectToken: 7c47e1a1a4bd +# exitZeroOnChanges: true +# workingDir: ./src/Ombi/ClientApp +# buildScriptName: storybookbuild +# exitOnceUploaded: true - - name: Publish to Chromatic and auto accept changes - if: github.ref == 'refs/heads/develop' - uses: chromaui/action@v1 - with: - projectToken: 7c47e1a1a4bd - autoAcceptChanges: true # 👈 Option to accept all changes - workingDir: ./src/Ombi/ClientApp - buildScriptName: storybookbuild - exitOnceUploaded: true +# - name: Publish to Chromatic and auto accept changes +# if: github.ref == 'refs/heads/develop' +# uses: chromaui/action@v1 +# with: +# projectToken: 7c47e1a1a4bd +# autoAcceptChanges: true # 👈 Option to accept all changes +# workingDir: ./src/Ombi/ClientApp +# buildScriptName: storybookbuild +# exitOnceUploaded: true diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index db9e49f86c..c4c7d803c6 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -33,7 +33,7 @@ jobs: unit-test: runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 diff --git a/src/Ombi/ClientApp/src/app/settings/plex/components/plex-server-dialog/plex-server-dialog.component.html b/src/Ombi/ClientApp/src/app/settings/plex/components/plex-server-dialog/plex-server-dialog.component.html index 606dda6392..b9984662d0 100644 --- a/src/Ombi/ClientApp/src/app/settings/plex/components/plex-server-dialog/plex-server-dialog.component.html +++ b/src/Ombi/ClientApp/src/app/settings/plex/components/plex-server-dialog/plex-server-dialog.component.html @@ -5,47 +5,47 @@