From 650accb337b977084b14d318925b3356a371a8ee Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 14:01:27 +0100 Subject: [PATCH 01/92] ci: :construction_worker: Started potential build migration --- .github/workflows/build.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..cee50ded6 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,37 @@ +name: CI Build + +on: + push: + # branches: [ develop, feature/** ] + branches: [ releaseNotes ] + pull_request: + branches: [ develop ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - uses: actions/setup-node@v2 + with: + node-version: '14' + + - name: UI Install + run: yarn --cwd ./src/Ombi/ClientApp install + + - name: Build and Publish UI + run: yarn --cwd ./src/Ombi/ClientApp run build + + - name: Publish UI Artifacts + uses: actions/upload-artifact@v2 + with: + name: dist + path: | + ./src/Ombi/ClientApp/dist/ + + - name: Run Unit Tests + run: dotnet test .\src\Ombi.sln From d6b894fbdd2cae8330b6bcce2a49411674443b14 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 14:12:10 +0100 Subject: [PATCH 02/92] ci: :building_construction: attempt at the tests again --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cee50ded6..08f1da007 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,4 +34,4 @@ jobs: ./src/Ombi/ClientApp/dist/ - name: Run Unit Tests - run: dotnet test .\src\Ombi.sln + run: dotnet test /src/Ombi.sln From 4b055aeb363f888089de03d2c865f895dde6cc3e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 14:51:17 +0100 Subject: [PATCH 03/92] test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08f1da007..e2e3425b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,4 +34,4 @@ jobs: ./src/Ombi/ClientApp/dist/ - name: Run Unit Tests - run: dotnet test /src/Ombi.sln + run: dotnet test ~/src/Ombi.sln From fa031a7142648d601bc78f2d62e955945df1e7a6 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 15:16:41 +0100 Subject: [PATCH 04/92] wip --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2e3425b3..ed1fa2d51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,4 +34,7 @@ jobs: ./src/Ombi/ClientApp/dist/ - name: Run Unit Tests - run: dotnet test ~/src/Ombi.sln + run: | + ls + cd ./src/Ombi + dotnet test From b71c987889f19e09ea54cf5f60015db73d61d8a4 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 15:17:51 +0100 Subject: [PATCH 05/92] wip --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed1fa2d51..7c2c33f82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,6 @@ jobs: - name: Run Unit Tests run: | - ls - cd ./src/Ombi - dotnet test + ls + cd src/ombi + dotnet test From 370c8452881fa5cd1d830a2babf20f5eb59d7e5d Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 15:25:37 +0100 Subject: [PATCH 06/92] wip --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c2c33f82..2dfe02e5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,5 @@ jobs: - name: Run Unit Tests run: | - ls - cd src/ombi + cd src/Ombi dotnet test From 23d8ef00a9cf9a94e90d31953ade4bd280a32099 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 16:41:50 +0100 Subject: [PATCH 07/92] more wip --- .github/workflows/build.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2dfe02e5d..1c879b236 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,4 +36,32 @@ jobs: - name: Run Unit Tests run: | cd src/Ombi - dotnet test + dotnet test --logger trx --results-directory "TestResults" + + - name: Upload dotnet test results + uses: actions/upload-artifact@v2 + with: + name: dotnet-results-${{ matrix.dotnet-version }} + path: TestResults-${{ matrix.dotnet-version }} + # Use always() to always run this step to publish test results when there are test failures + if: ${{ always() }} + + publish: + runs-on: ubuntu-latest + # needs: [build] + strategy: + matrix: + include: + - os: win10-x64 + format: zip + compression: zip + - os: linux-x64 + format: tar.gz + compression: tar + steps: + - name: Publish Backend ${{ matrix.os }} + run: | + cd src/Ombi + dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true + +#https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#using-environment-variables-in-a-matrix \ No newline at end of file From cfd383f05e9bbc3b7b215e60dc14ef523c84b4f2 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 16:42:44 +0100 Subject: [PATCH 08/92] moar --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c879b236..89c208303 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,6 +61,7 @@ jobs: steps: - name: Publish Backend ${{ matrix.os }} run: | + ls cd src/Ombi dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true From f56159ab64ff4aaebeaf19485c19a3bbde48ed9e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 16:43:42 +0100 Subject: [PATCH 09/92] forgot checkout --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89c208303..7124ed92b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,6 +59,7 @@ jobs: format: tar.gz compression: tar steps: + - uses: actions/checkout@v2 - name: Publish Backend ${{ matrix.os }} run: | ls From 2ae4eb646d35e3194ed06d2674bb27da97c17ae8 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 16:53:22 +0100 Subject: [PATCH 10/92] oooo --- .github/workflows/build.yml | 39 ++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7124ed92b..19647809a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - name: Publish UI Artifacts uses: actions/upload-artifact@v2 with: - name: dist + name: angular_dist path: | ./src/Ombi/ClientApp/dist/ @@ -48,22 +48,55 @@ jobs: publish: runs-on: ubuntu-latest - # needs: [build] + needs: [build] strategy: matrix: include: - os: win10-x64 format: zip compression: zip + - os: win10-x86 + format: zip + compression: zip - os: linux-x64 format: tar.gz compression: tar + - os: linux-arm + format: tar.gz + compression: tar + - os: linux-arm64 + compression: tar + format: tar.gz + - os: osx-x64 + compression: tar + format: tar.gz steps: - uses: actions/checkout@v2 - name: Publish Backend ${{ matrix.os }} run: | - ls cd src/Ombi dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true + - name: Download Angular + uses: actions/download-artifact@v2 + with: + name: angular_dist + + - name: Copy Dist to Artifacts + run: | + copy dist ${{ matrix.os }}/ClientApp/dist + + - name: Archive Release + uses: thedoctor0/zip-release@master + with: + type: '${{ matrix.compression }}' + filename: '${{ matrix.os }}.${{ matrix.compression }}' + directory: '${{ matrix.os }}' + # - name: Publish UI Artifacts + # uses: actions/upload-artifact@v2 + # with: + # name: dist + # path: | + # ${{ matrix.os }} + #https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#using-environment-variables-in-a-matrix \ No newline at end of file From 27421f61d7b36a4d86011abe6c35d7999b3984e4 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 16:54:31 +0100 Subject: [PATCH 11/92] fix --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19647809a..ebd15e6d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,8 +79,8 @@ jobs: - name: Download Angular uses: actions/download-artifact@v2 - with: - name: angular_dist + with: + name: angular_dist - name: Copy Dist to Artifacts run: | From 05b634b4a13dda3e9a8fdf5340cad4f90645bd40 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 16:56:37 +0100 Subject: [PATCH 12/92] split tests and build --- .github/workflows/build.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ebd15e6d3..d37dda743 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,14 +8,10 @@ on: branches: [ develop ] jobs: - build: + build-ui: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - - uses: actions/setup-node@v2 with: node-version: '14' @@ -23,7 +19,7 @@ jobs: - name: UI Install run: yarn --cwd ./src/Ombi/ClientApp install - - name: Build and Publish UI + - name: Build UI run: yarn --cwd ./src/Ombi/ClientApp run build - name: Publish UI Artifacts @@ -33,6 +29,14 @@ jobs: path: | ./src/Ombi/ClientApp/dist/ + unit-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + - name: Run Unit Tests run: | cd src/Ombi From 6c46cf726293ea2b9beda98381d0e486e71ac6a8 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 16:57:11 +0100 Subject: [PATCH 13/92] fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d37dda743..2f851e610 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: publish: runs-on: ubuntu-latest - needs: [build] + needs: [build-ui] strategy: matrix: include: From 02a19922fb4a066bd25274628bd8a348db07edfb Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 17:08:01 +0100 Subject: [PATCH 14/92] fixed copy --- .github/workflows/build.yml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f851e610..fee340558 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,14 @@ jobs: with: node-version: '14' + - name: NodeModules Cache + uses: actions/cache@v2 + with: + path: '**/node_modules' + key: node_modules-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + node_modules + - name: UI Install run: yarn --cwd ./src/Ombi/ClientApp install @@ -45,8 +53,8 @@ jobs: - name: Upload dotnet test results uses: actions/upload-artifact@v2 with: - name: dotnet-results-${{ matrix.dotnet-version }} - path: TestResults-${{ matrix.dotnet-version }} + name: dotnet-results-* + path: TestResults # Use always() to always run this step to publish test results when there are test failures if: ${{ always() }} @@ -76,6 +84,15 @@ jobs: format: tar.gz steps: - uses: actions/checkout@v2 + + - name: Nuget Cache + uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget + - name: Publish Backend ${{ matrix.os }} run: | cd src/Ombi @@ -88,8 +105,8 @@ jobs: - name: Copy Dist to Artifacts run: | - copy dist ${{ matrix.os }}/ClientApp/dist - + cp -a /dist/. ${{ matrix.os }}/ClientApp/dist/ + - name: Archive Release uses: thedoctor0/zip-release@master with: From b60fca053adc3a54c52bd4e3d52047c3b8b1b72f Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 17:08:44 +0100 Subject: [PATCH 15/92] syntaxxxxxxx --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fee340558..9d1869fdc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,13 +16,13 @@ jobs: with: node-version: '14' - - name: NodeModules Cache - uses: actions/cache@v2 - with: - path: '**/node_modules' - key: node_modules-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - node_modules + - name: NodeModules Cache + uses: actions/cache@v2 + with: + path: '**/node_modules' + key: node_modules-${{ hashFiles('**/yarn.lock') }} + restore-keys: | + node_modules - name: UI Install run: yarn --cwd ./src/Ombi/ClientApp install From 1ab55ae32e85e477f57608c0aacba6fd6c59aee2 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 17:09:18 +0100 Subject: [PATCH 16/92] indent --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d1869fdc..0b228c90e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: path: '**/node_modules' key: node_modules-${{ hashFiles('**/yarn.lock') }} restore-keys: | - node_modules + node_modules - name: UI Install run: yarn --cwd ./src/Ombi/ClientApp install @@ -88,10 +88,10 @@ jobs: - name: Nuget Cache uses: actions/cache@v2 with: - path: ~/.nuget/packages - key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} - restore-keys: | - ${{ runner.os }}-nuget + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget - name: Publish Backend ${{ matrix.os }} run: | From f72e986bd0e9be15633ce6f5e80d78571073b231 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 17:10:11 +0100 Subject: [PATCH 17/92] ehh --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b228c90e..98b079e80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,6 @@ jobs: with: path: '**/node_modules' key: node_modules-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - node_modules - name: UI Install run: yarn --cwd ./src/Ombi/ClientApp install From 34f4002c57de022854d34496494b485ddcbe0234 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 17:44:34 +0100 Subject: [PATCH 18/92] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98b079e80..96bc9bd23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,6 +103,7 @@ jobs: - name: Copy Dist to Artifacts run: | + cd src/Ombi cp -a /dist/. ${{ matrix.os }}/ClientApp/dist/ - name: Archive Release @@ -118,4 +119,4 @@ jobs: # path: | # ${{ matrix.os }} -#https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#using-environment-variables-in-a-matrix \ No newline at end of file +#https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#using-environment-variables-in-a-matrix From 6c014db63ed0a08a9891bd0675e891ffddda7a82 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:06:50 +0100 Subject: [PATCH 19/92] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96bc9bd23..0cc41b484 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -103,8 +103,8 @@ jobs: - name: Copy Dist to Artifacts run: | - cd src/Ombi - cp -a /dist/. ${{ matrix.os }}/ClientApp/dist/ + ls + cp -a /dist/. /src/Ombi/${{ matrix.os }}/ClientApp/dist/ - name: Archive Release uses: thedoctor0/zip-release@master From 2a0d079c5a3a7b33e419eeaee676078b9b9d087e Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:11:15 +0100 Subject: [PATCH 20/92] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0cc41b484..1083856b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: with: name: angular_dist path: | - ./src/Ombi/ClientApp/dist/ + ./src/Ombi/ClientApp/dist unit-test: runs-on: ubuntu-latest From fba183d2947d1e159ebf25f963d7f73d5bbd5569 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:16:05 +0100 Subject: [PATCH 21/92] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1083856b5..47623f0ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,6 +100,7 @@ jobs: uses: actions/download-artifact@v2 with: name: angular_dist + path: dist - name: Copy Dist to Artifacts run: | From 304c7591ca7710499c5bc49e37f2367655c553cb Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:26:04 +0100 Subject: [PATCH 22/92] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47623f0ef..924511602 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,7 +105,7 @@ jobs: - name: Copy Dist to Artifacts run: | ls - cp -a /dist/. /src/Ombi/${{ matrix.os }}/ClientApp/dist/ + cp -a /dist/ /src/Ombi/${{ matrix.os }}/ClientApp/dist/ - name: Archive Release uses: thedoctor0/zip-release@master From f7fa7b25add0c11fc2a5fff0441a9502bb75af2d Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:36:23 +0100 Subject: [PATCH 23/92] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 924511602..213810577 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,7 +105,7 @@ jobs: - name: Copy Dist to Artifacts run: | ls - cp -a /dist/ /src/Ombi/${{ matrix.os }}/ClientApp/dist/ + cp -r /dist/* /src/Ombi/${{ matrix.os }}/ClientApp/dist/ - name: Archive Release uses: thedoctor0/zip-release@master From 3bfe7aec4515059f3c19d058a0bd3a46c67bf3a9 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:41:43 +0100 Subject: [PATCH 24/92] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 213810577..38ef3862f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -105,7 +105,7 @@ jobs: - name: Copy Dist to Artifacts run: | ls - cp -r /dist/* /src/Ombi/${{ matrix.os }}/ClientApp/dist/ + cp -r dist/* /src/Ombi/${{ matrix.os }}/ClientApp/dist/ - name: Archive Release uses: thedoctor0/zip-release@master From e995087971c61c56a6e34738910897c7b0a86890 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:43:53 +0100 Subject: [PATCH 25/92] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38ef3862f..9ecb244e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,14 +45,14 @@ jobs: - name: Run Unit Tests run: | - cd src/Ombi + cd src dotnet test --logger trx --results-directory "TestResults" - name: Upload dotnet test results uses: actions/upload-artifact@v2 with: name: dotnet-results-* - path: TestResults + path: src/TestResults # Use always() to always run this step to publish test results when there are test failures if: ${{ always() }} From 5c10cc172166da778ed92e878ae792c1d4a9177d Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:51:22 +0100 Subject: [PATCH 26/92] Update build.yml --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ecb244e0..75bafc6bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: - name: Upload dotnet test results uses: actions/upload-artifact@v2 with: - name: dotnet-results-* + name: dotnet-results path: src/TestResults # Use always() to always run this step to publish test results when there are test failures if: ${{ always() }} @@ -105,6 +105,7 @@ jobs: - name: Copy Dist to Artifacts run: | ls + mkdir -p /src/Ombi/${{ matrix.os }}/ClientApp/dist cp -r dist/* /src/Ombi/${{ matrix.os }}/ClientApp/dist/ - name: Archive Release @@ -112,7 +113,7 @@ jobs: with: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.compression }}' - directory: '${{ matrix.os }}' + directory: 'src/Ombi/${{ matrix.os }}' # - name: Publish UI Artifacts # uses: actions/upload-artifact@v2 # with: From b0cea834dd8a88f76f1426e2bef254d22836421a Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 18:59:08 +0100 Subject: [PATCH 27/92] Update build.yml --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75bafc6bf..512f02fc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,13 +100,14 @@ jobs: uses: actions/download-artifact@v2 with: name: angular_dist - path: dist + path: /src/Ombi/dist/${{ matrix.os }}/ - name: Copy Dist to Artifacts run: | ls - mkdir -p /src/Ombi/${{ matrix.os }}/ClientApp/dist - cp -r dist/* /src/Ombi/${{ matrix.os }}/ClientApp/dist/ + cd /src/Ombi/${{ matrix.os }} + mkdir -p /ClientApp/dist + cp -r dist/* /ClientApp/dist/ - name: Archive Release uses: thedoctor0/zip-release@master From 668e328ed72e2c3ac3b245139a3042aa00f28d9e Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 19:07:40 +0100 Subject: [PATCH 28/92] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 512f02fc7..3e7946b49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,6 +95,7 @@ jobs: run: | cd src/Ombi dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true + ls - name: Download Angular uses: actions/download-artifact@v2 From 6ba6f0c88e26e11b98151ce11318a56237d131ce Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 19:43:05 +0100 Subject: [PATCH 29/92] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e7946b49..6f547a3a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,7 +101,7 @@ jobs: uses: actions/download-artifact@v2 with: name: angular_dist - path: /src/Ombi/dist/${{ matrix.os }}/ + path: /src/Ombi/${{ matrix.os }}/ - name: Copy Dist to Artifacts run: | From f4a4e86bba4ea027462e52d16b0d8880775205b5 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 19:51:29 +0100 Subject: [PATCH 30/92] Update build.yml --- .github/workflows/build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f547a3a5..3bd99bf15 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,16 +92,14 @@ jobs: ${{ runner.os }}-nuget - name: Publish Backend ${{ matrix.os }} - run: | - cd src/Ombi - dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true - ls + run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true + working-directory: src/Ombi - name: Download Angular uses: actions/download-artifact@v2 with: name: angular_dist - path: /src/Ombi/${{ matrix.os }}/ + path: ~/src/Ombi/${{ matrix.os }} - name: Copy Dist to Artifacts run: | From 9180028eedb17dca81fe84543e4fc01e5aef5928 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 19:53:30 +0100 Subject: [PATCH 31/92] Update build.yml --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bd99bf15..ea352c2ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,14 @@ jobs: - uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.x' + + - name: Nuget Cache + uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget - name: Run Unit Tests run: | From 8c6c5fd5a9f760b903f17d3f2c0107892cdb216e Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 19:58:53 +0100 Subject: [PATCH 32/92] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea352c2ab..b979c21eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,14 +107,14 @@ jobs: uses: actions/download-artifact@v2 with: name: angular_dist - path: ~/src/Ombi/${{ matrix.os }} + path: ~/src/Ombi/dist - name: Copy Dist to Artifacts run: | ls - cd /src/Ombi/${{ matrix.os }} - mkdir -p /ClientApp/dist - cp -r dist/* /ClientApp/dist/ + mkdir -p /${{ matrix.os }}/ClientApp/dist + cp -r dist/* /${{ matrix.os }}/ClientApp/dist/ + working-directory: src/Ombi - name: Archive Release uses: thedoctor0/zip-release@master From 6dcee14a80bf7dd5556e33750bdabd916e1a611d Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 20:02:57 +0100 Subject: [PATCH 33/92] Update build.yml --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b979c21eb..c58e5608d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,7 +112,9 @@ jobs: - name: Copy Dist to Artifacts run: | ls - mkdir -p /${{ matrix.os }}/ClientApp/dist + cd ${{ matrix.os }} + mkdir -p /ClientApp/dist + cd .. cp -r dist/* /${{ matrix.os }}/ClientApp/dist/ working-directory: src/Ombi From 8ba6e4aed11266bfa0f818a71405068774ad870e Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 20:13:37 +0100 Subject: [PATCH 34/92] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c58e5608d..3b9593f86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,9 +113,9 @@ jobs: run: | ls cd ${{ matrix.os }} - mkdir -p /ClientApp/dist + sudo mkdir -p /ClientApp/dist cd .. - cp -r dist/* /${{ matrix.os }}/ClientApp/dist/ + sudo cp -r dist/* /${{ matrix.os }}/ClientApp/dist/ working-directory: src/Ombi - name: Archive Release From 1d4a32c6a71a084a284e86087c257d0f788ad981 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 20:20:25 +0100 Subject: [PATCH 35/92] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b9593f86..77bd019f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,7 +115,8 @@ jobs: cd ${{ matrix.os }} sudo mkdir -p /ClientApp/dist cd .. - sudo cp -r dist/* /${{ matrix.os }}/ClientApp/dist/ + ls + sudo mv -v dist/* /${{ matrix.os }}/ClientApp/dist/ working-directory: src/Ombi - name: Archive Release From e3222b64a4ec1a74697519be17d799580e602ba1 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 20:25:46 +0100 Subject: [PATCH 36/92] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77bd019f9..18782393a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -116,7 +116,7 @@ jobs: sudo mkdir -p /ClientApp/dist cd .. ls - sudo mv -v dist/* /${{ matrix.os }}/ClientApp/dist/ + sudo mv -v ~/src/Ombi/dist/* /${{ matrix.os }}/ClientApp/dist/ working-directory: src/Ombi - name: Archive Release From 184ccaeaad4303a3b5e2043303d781058de1d382 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 20:30:35 +0100 Subject: [PATCH 37/92] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18782393a..44d075056 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,9 +114,10 @@ jobs: ls cd ${{ matrix.os }} sudo mkdir -p /ClientApp/dist + ls cd .. ls - sudo mv -v ~/src/Ombi/dist/* /${{ matrix.os }}/ClientApp/dist/ + sudo mv -v ~/src/Ombi/dist/* /${{ matrix.os }}/ClientApp/dist working-directory: src/Ombi - name: Archive Release From 9428c469e1f76e2053c10ff16057ea58f790dddf Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 20:36:59 +0100 Subject: [PATCH 38/92] Update build.yml --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44d075056..815aec737 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,11 +113,10 @@ jobs: run: | ls cd ${{ matrix.os }} - sudo mkdir -p /ClientApp/dist - ls + sudo mkdir -p /ClientApp cd .. ls - sudo mv -v ~/src/Ombi/dist/* /${{ matrix.os }}/ClientApp/dist + sudo mv -v ~/src/Ombi/dist/* /${{ matrix.os }}/ClientApp/ working-directory: src/Ombi - name: Archive Release From bd4689cce6ee08cd52ec5e40c8ed10ece514004d Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 20:43:31 +0100 Subject: [PATCH 39/92] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 815aec737..4e1b3657e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -116,7 +116,7 @@ jobs: sudo mkdir -p /ClientApp cd .. ls - sudo mv -v ~/src/Ombi/dist/* /${{ matrix.os }}/ClientApp/ + sudo mv -v ~/src/Ombi/dist/ /${{ matrix.os }}/ClientApp working-directory: src/Ombi - name: Archive Release From cc69d66d22b58702082f1ca663760f8b2ac05320 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 28 Sep 2021 20:48:15 +0100 Subject: [PATCH 40/92] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e1b3657e..c90a07261 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -116,7 +116,7 @@ jobs: sudo mkdir -p /ClientApp cd .. ls - sudo mv -v ~/src/Ombi/dist/ /${{ matrix.os }}/ClientApp + sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp/ working-directory: src/Ombi - name: Archive Release From 8e26258a1dfb208054bc0f7b7e12cb23b9a5dae4 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 21:29:49 +0100 Subject: [PATCH 41/92] =?UTF-8?q?sleep=20=F0=9F=92=A4=F0=9F=92=A4?= =?UTF-8?q?=F0=9F=92=A4=F0=9F=92=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c90a07261..538b74e21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.x' - + - name: Nuget Cache uses: actions/cache@v2 with: @@ -119,17 +119,14 @@ jobs: sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp/ working-directory: src/Ombi + - name: Sleep for 30 seconds + run: sleep 30s + shell: bash + - name: Archive Release uses: thedoctor0/zip-release@master with: type: '${{ matrix.compression }}' - filename: '${{ matrix.os }}.${{ matrix.compression }}' + filename: '${{ matrix.os }}.${{ matrix.format }}' directory: 'src/Ombi/${{ matrix.os }}' - # - name: Publish UI Artifacts - # uses: actions/upload-artifact@v2 - # with: - # name: dist - # path: | - # ${{ matrix.os }} -#https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#using-environment-variables-in-a-matrix From 9246bafda28176fc133038f15ba914dd87989369 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 21:37:30 +0100 Subject: [PATCH 42/92] =?UTF-8?q?=F0=9F=98=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 538b74e21..13e0b8f37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,5 +128,13 @@ jobs: with: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.format }}' - directory: 'src/Ombi/${{ matrix.os }}' + path: '${{ matrix.os }}' + directory: 'src/Ombi/'' + + - name: Publish Release + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.os }} + path: | + ./src/Ombi/${{ matrix.os }}.${{ matrix.format }} From 4fdbb394a4011dac0c2bb81cffadcc9ea791c4ef Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 21:37:43 +0100 Subject: [PATCH 43/92] syntax --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 13e0b8f37..175b43699 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,7 +129,7 @@ jobs: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.format }}' path: '${{ matrix.os }}' - directory: 'src/Ombi/'' + directory: 'src/Ombi/' - name: Publish Release uses: actions/upload-artifact@v2 From 404b3517e906409200ad45b534148b986bbf47d5 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 21:42:26 +0100 Subject: [PATCH 44/92] remove sleep --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 175b43699..24d861890 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,10 +119,6 @@ jobs: sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp/ working-directory: src/Ombi - - name: Sleep for 30 seconds - run: sleep 30s - shell: bash - - name: Archive Release uses: thedoctor0/zip-release@master with: From 5b816fa9069f41c16697cc7c2e14aa269fc5fc77 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 21:50:52 +0100 Subject: [PATCH 45/92] ci: :construction_worker: Added the release step --- .github/workflows/build.yml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 24d861890..6260d7168 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,17 +56,18 @@ jobs: cd src dotnet test --logger trx --results-directory "TestResults" - - name: Upload dotnet test results - uses: actions/upload-artifact@v2 - with: - name: dotnet-results - path: src/TestResults - # Use always() to always run this step to publish test results when there are test failures - if: ${{ always() }} + ## Don't need yet + # - name: Upload dotnet test results + # uses: actions/upload-artifact@v2 + # with: + # name: dotnet-results + # path: src/TestResults + # # Use always() to always run this step to publish test results when there are test failures + # if: ${{ always() }} publish: runs-on: ubuntu-latest - needs: [build-ui] + needs: [ build-ui ] strategy: matrix: include: @@ -134,3 +135,20 @@ jobs: path: | ./src/Ombi/${{ matrix.os }}.${{ matrix.format }} + release: + needs: [ publish, unit-test ] + runs-on: ubuntu-latest + steps: + - name: Conventional Changelog Action + uses: TriPSs/conventional-changelog-action@v3 + with: + github-token: ${{ secrets.github_token }} + git-message: 'chore(release): {version}' + + - name: Download Artifacts + uses: actions/download-artifact@v2 + with: + path: artifacts + + + From 49e84a64197eb5c6e168e0c1d67f48fcafdf521a Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 22:00:40 +0100 Subject: [PATCH 46/92] ci: :building_construction: checkout release --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6260d7168..610263c1c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,6 +139,7 @@ jobs: needs: [ publish, unit-test ] runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 - name: Conventional Changelog Action uses: TriPSs/conventional-changelog-action@v3 with: From 8b1dfc5732dfea6625941850a89a84caf29d28fb Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 22:13:07 +0100 Subject: [PATCH 47/92] ci: :building_construction: ci --- .github/workflows/build.yml | 3 +++ version.json | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 version.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 610263c1c..dac6eb79d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,6 +145,9 @@ jobs: with: github-token: ${{ secrets.github_token }} git-message: 'chore(release): {version}' + version-file: 'version.json' + output-file: 'CHANGELOG2.md' + skip-on-empty: 'false' - name: Download Artifacts uses: actions/download-artifact@v2 diff --git a/version.json b/version.json new file mode 100644 index 000000000..20fa3a455 --- /dev/null +++ b/version.json @@ -0,0 +1,3 @@ +{ + "version":"4.1.0" +} \ No newline at end of file From 01f8de7a32b3d9ea107e0a09db59b8840a3bfe5f Mon Sep 17 00:00:00 2001 From: Conventional Changelog Action Date: Tue, 28 Sep 2021 21:18:24 +0000 Subject: [PATCH 48/92] chore(release): v4.1.1 --- CHANGELOG2.md | 35 +++++++++++++++++++++++++++++++++++ version.json | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG2.md diff --git a/CHANGELOG2.md b/CHANGELOG2.md new file mode 100644 index 000000000..fd53c20c8 --- /dev/null +++ b/CHANGELOG2.md @@ -0,0 +1,35 @@ +## [4.1.1](https://github.com/Ombi-app/Ombi/compare/v4.0.1506...v4.1.1) (2021-09-28) + + + +## [4.0.1506](https://github.com/Ombi-app/Ombi/compare/v4.0.1499...v4.0.1506) (2021-09-28) + + +### Bug Fixes + +* :bug: Fixed the issue where we were not generating the newsletter plex mediaserver link correctly ([b6064e9](https://github.com/Ombi-app/Ombi/commit/b6064e9308ee1218517f54d331c9bd7953ca631e)) +* **request-limits:** :bug: Fixed the issue where we were calculating Tv Request limit reset date incorrectly ([ceaec3f](https://github.com/Ombi-app/Ombi/commit/ceaec3feb0c9fbdab48595d7e425930a39d87ad5)) +* :bug: Fixed the issue where the user management login dates were not local time ([97be373](https://github.com/Ombi-app/Ombi/commit/97be3737700ed7b1ee915dbcd9f44103665d472c)), closes [#2925](https://github.com/Ombi-app/Ombi/issues/2925) + + +### Features + +* **request-limits:** :card_file_box: Added new user field migrations to mysql and sqlite ([f73bccb](https://github.com/Ombi-app/Ombi/commit/f73bccbea759fb4aeadc32f94b1ef6c9aecc5e94)) +* **request-limits:** :sparkles: Added in the main logic for the new request limits ([70d5bf5](https://github.com/Ombi-app/Ombi/commit/70d5bf52bff2e321fb1f3d00fd1cd1121a2717b7)) +* **request-limits:** :sparkles: Added the UI portion to set the new limits ([978d4ea](https://github.com/Ombi-app/Ombi/commit/978d4ea33b32d5a8333c75e29d4cd702e434c5f0)) +* **request-limits:** :sparkles: Request limits are no longer a rolling date. But reset at the start of the week or month depending on the preference ([364b9f1](https://github.com/Ombi-app/Ombi/commit/364b9f11afcd470cc2b112cf81cd840316ddc80e)) +* **request-limits:** :sparkles: Updated the RequestLimit Rules to use the new refactored service ([e31ee8d](https://github.com/Ombi-app/Ombi/commit/e31ee8d89213a8fc179db56cc51d3f02648b51ec)) +* **request-limits:** :tada: Started on the request limits, applied to the user model ([f5310b7](https://github.com/Ombi-app/Ombi/commit/f5310b786b43b3c00d392da977c2b3367a5e4e11)) + + + +## [4.0.1488](https://github.com/Ombi-app/Ombi/compare/v4.0.1487...v4.0.1488) (2021-09-18) + + +### Features + +* **discover:** :lipstick: Moved the advanced search to the nav bar for better discovery ([f83abaf](https://github.com/Ombi-app/Ombi/commit/f83abafdd9fc416c8ca4d99a52b5fc94e0b781fd)) +* **plex:** :zap: Use the new Plex Pass includeGuids feature for syncing plex movies ([7c5646d](https://github.com/Ombi-app/Ombi/commit/7c5646d416372983ac8996b1a6539e671db18c86)) + + + diff --git a/version.json b/version.json index 20fa3a455..d5081f27d 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version":"4.1.0" + "version": "4.1.1" } \ No newline at end of file From 5351c14cb087f9ecbb37b784724bb35107d17cb8 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 22:19:37 +0100 Subject: [PATCH 49/92] fix: :bug: Pretending to fix a bug --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dac6eb79d..b33fb5c66 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,7 +147,6 @@ jobs: git-message: 'chore(release): {version}' version-file: 'version.json' output-file: 'CHANGELOG2.md' - skip-on-empty: 'false' - name: Download Artifacts uses: actions/download-artifact@v2 From a46a96551b6685e93492f5962184eba76f4335af Mon Sep 17 00:00:00 2001 From: Conventional Changelog Action Date: Tue, 28 Sep 2021 21:26:37 +0000 Subject: [PATCH 50/92] chore(release): v4.1.2 --- CHANGELOG2.md | 10 +++++++++- version.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG2.md b/CHANGELOG2.md index fd53c20c8..791ab700e 100644 --- a/CHANGELOG2.md +++ b/CHANGELOG2.md @@ -1,3 +1,12 @@ +## [4.1.2](https://github.com/Ombi-app/Ombi/compare/v4.1.1...v4.1.2) (2021-09-28) + + +### Bug Fixes + +* :bug: Pretending to fix a bug ([5351c14](https://github.com/Ombi-app/Ombi/commit/5351c14cb087f9ecbb37b784724bb35107d17cb8)) + + + ## [4.1.1](https://github.com/Ombi-app/Ombi/compare/v4.0.1506...v4.1.1) (2021-09-28) @@ -29,7 +38,6 @@ ### Features * **discover:** :lipstick: Moved the advanced search to the nav bar for better discovery ([f83abaf](https://github.com/Ombi-app/Ombi/commit/f83abafdd9fc416c8ca4d99a52b5fc94e0b781fd)) -* **plex:** :zap: Use the new Plex Pass includeGuids feature for syncing plex movies ([7c5646d](https://github.com/Ombi-app/Ombi/commit/7c5646d416372983ac8996b1a6539e671db18c86)) diff --git a/version.json b/version.json index d5081f27d..b58d89507 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.1.1" + "version": "4.1.2" } \ No newline at end of file From 98584a588775a67eecc03a8b573398b5ffc7fe11 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 22:36:02 +0100 Subject: [PATCH 51/92] ci: :building_construction: Create the correct folders --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b33fb5c66..de6698dcd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,7 +117,7 @@ jobs: sudo mkdir -p /ClientApp cd .. ls - sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp/ + sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp/dist/ working-directory: src/Ombi - name: Archive Release @@ -125,7 +125,7 @@ jobs: with: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.format }}' - path: '${{ matrix.os }}' + path: '${{ matrix.os }}/' directory: 'src/Ombi/' - name: Publish Release @@ -152,6 +152,7 @@ jobs: uses: actions/download-artifact@v2 with: path: artifacts + From 1b66e740e5267fb35c08b908f124bb05c214df99 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 28 Sep 2021 22:43:04 +0100 Subject: [PATCH 52/92] ci: :building_construction: fix --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de6698dcd..d7e9fdbbe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,6 +115,9 @@ jobs: ls cd ${{ matrix.os }} sudo mkdir -p /ClientApp + cd ClientApp + sudo mkdir -p /dist + cd .. cd .. ls sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp/dist/ @@ -146,7 +149,7 @@ jobs: github-token: ${{ secrets.github_token }} git-message: 'chore(release): {version}' version-file: 'version.json' - output-file: 'CHANGELOG2.md' + output-file: 'CHANGELOG.md' - name: Download Artifacts uses: actions/download-artifact@v2 From 42b14c931410f570887f208386ccf662668300b8 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 10:05:17 +0100 Subject: [PATCH 53/92] ci: :building_construction: more --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7e9fdbbe..8692d52ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,9 +114,9 @@ jobs: run: | ls cd ${{ matrix.os }} - sudo mkdir -p /ClientApp + sudo mkdir /ClientApp cd ClientApp - sudo mkdir -p /dist + sudo mkdir /dist cd .. cd .. ls From 5e49eff598c0ecf8031eb905e8384148eba54bb3 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 10:10:07 +0100 Subject: [PATCH 54/92] ci: :building_construction: more --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8692d52ed..0014a4bf2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,10 +114,7 @@ jobs: run: | ls cd ${{ matrix.os }} - sudo mkdir /ClientApp - cd ClientApp - sudo mkdir /dist - cd .. + sudo mkdir -p /ClientApp/dist cd .. ls sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp/dist/ From 036a35f7aef1ef4409c1e4747fd3af77f774d99d Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 10:14:34 +0100 Subject: [PATCH 55/92] ci: :building_construction: more --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0014a4bf2..3c10bd0fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,7 +117,7 @@ jobs: sudo mkdir -p /ClientApp/dist cd .. ls - sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp/dist/ + sudo mv ~/src/Ombi/dist/ ./${{ matrix.os }}/ClientApp/dist/ working-directory: src/Ombi - name: Archive Release From 14f87177732b51078daad423221881d438132d24 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 10:18:47 +0100 Subject: [PATCH 56/92] ci: :building_construction: more --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c10bd0fe..31e2039e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,10 +114,10 @@ jobs: run: | ls cd ${{ matrix.os }} - sudo mkdir -p /ClientApp/dist + sudo mkdir -p /ClientApp cd .. ls - sudo mv ~/src/Ombi/dist/ ./${{ matrix.os }}/ClientApp/dist/ + sudo mv ~/src/Ombi/dist/ /${{ matrix.os }}/ClientApp working-directory: src/Ombi - name: Archive Release From f4b89bb54a19406b9b4fb6b6dd385c1525860a6c Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 10:24:09 +0100 Subject: [PATCH 57/92] ci: :building_construction: more --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31e2039e3..a98e825f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -117,7 +117,7 @@ jobs: sudo mkdir -p /ClientApp cd .. ls - sudo mv ~/src/Ombi/dist/ /${{ matrix.os }}/ClientApp + sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp working-directory: src/Ombi - name: Archive Release From 75ae5d0e95c66d739cdde5df496b273bb35db05d Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 11:21:11 +0100 Subject: [PATCH 58/92] ci: :building_construction: more --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a98e825f5..70932bf5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,6 +118,10 @@ jobs: cd .. ls sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp + cd ${{ matrix.os }} + ls + cd ClientApp + ls working-directory: src/Ombi - name: Archive Release From 07e042b02f6025494eaa07543f300a353447a348 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 11:57:01 +0100 Subject: [PATCH 59/92] ci: :building_construction: ci --- .github/workflows/build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70932bf5f..eade6a82f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,13 +115,20 @@ jobs: ls cd ${{ matrix.os }} sudo mkdir -p /ClientApp + echo "mkdir /ClientApp" cd .. + echo "List main folder" ls - sudo mv ~/src/Ombi/dist/ ${{ matrix.os }}/ClientApp + echo "Copy dist to /ClientApp" + sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp cd ${{ matrix.os }} + echo "List OS folder" ls + echo "list Clientapp" cd ClientApp ls + echo "list root" + ls ~/ working-directory: src/Ombi - name: Archive Release From 3019e380fdbeb0b36dfbcdf9c4e2a2a70e94590a Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 12:01:08 +0100 Subject: [PATCH 60/92] ci: :building_construction: more --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eade6a82f..526759b78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -120,7 +120,7 @@ jobs: echo "List main folder" ls echo "Copy dist to /ClientApp" - sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp + sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp/ cd ${{ matrix.os }} echo "List OS folder" ls From 48b5ea9218273eb00068011cf3302b85b231bc1f Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 12:06:21 +0100 Subject: [PATCH 61/92] ci: :building_construction: --- .github/workflows/build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 526759b78..ce9679db3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,15 +112,14 @@ jobs: - name: Copy Dist to Artifacts run: | - ls cd ${{ matrix.os }} - sudo mkdir -p /ClientApp + sudo mkdir -p /ClientApp/dist echo "mkdir /ClientApp" - cd .. - echo "List main folder" + echo "list os (ClientApp should be here)" ls + cd .. echo "Copy dist to /ClientApp" - sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp/ + sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp/dist cd ${{ matrix.os }} echo "List OS folder" ls From 2cb6bd480d1a6d788fcd6858cccc6c4e026ad55b Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 12:11:32 +0100 Subject: [PATCH 62/92] ci: :building_construction: --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce9679db3..53056f791 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,7 +113,7 @@ jobs: - name: Copy Dist to Artifacts run: | cd ${{ matrix.os }} - sudo mkdir -p /ClientApp/dist + sudo mkdir -p ClientApp/dist echo "mkdir /ClientApp" echo "list os (ClientApp should be here)" ls From f5e5db0ba485fb29e2878f2d333cc01040c988c0 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 12:23:12 +0100 Subject: [PATCH 63/92] ci: :building_construction: --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53056f791..7398ffb04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,8 +135,7 @@ jobs: with: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.format }}' - path: '${{ matrix.os }}/' - directory: 'src/Ombi/' + directory: 'src/Ombi/${{ matrix.os }}/' - name: Publish Release uses: actions/upload-artifact@v2 From 8625fb2810b2db5756aba96f3cd63ca0b119afe2 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 12:29:18 +0100 Subject: [PATCH 64/92] ci: :building_construction: --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7398ffb04..b4894dd02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,8 @@ jobs: with: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.format }}' - directory: 'src/Ombi/${{ matrix.os }}/' + path: '${{ matrix.os }}/.' + directory: 'src/Ombi/' - name: Publish Release uses: actions/upload-artifact@v2 From 38692b09ce3ac4a419f1ca3cd746b5e17934623b Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 13:16:23 +0100 Subject: [PATCH 65/92] ci: :building_construction: --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4894dd02..999b7e674 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: with: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.format }}' - path: '${{ matrix.os }}/.' + path: '/${{ matrix.os }}/' directory: 'src/Ombi/' - name: Publish Release From cb6ed416d41e59d68114be0f150519dff6fc5354 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 13:21:44 +0100 Subject: [PATCH 66/92] ci: :building_construction: --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 999b7e674..53056f791 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: with: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.format }}' - path: '/${{ matrix.os }}/' + path: '${{ matrix.os }}/' directory: 'src/Ombi/' - name: Publish Release From ef2122d8131cb81b6d332b657ebc9e032585ee1b Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 13:34:18 +0100 Subject: [PATCH 67/92] ci: :building_construction: --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53056f791..db8afc7f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -135,7 +135,7 @@ jobs: with: type: '${{ matrix.compression }}' filename: '${{ matrix.os }}.${{ matrix.format }}' - path: '${{ matrix.os }}/' + path: '${{ matrix.os }}/*' directory: 'src/Ombi/' - name: Publish Release From b79878b631a979c9ae5b12461b1e49ca40d2d73d Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 14:04:54 +0100 Subject: [PATCH 68/92] ci: :building_construction: --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db8afc7f5..abc04ff33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,9 +134,9 @@ jobs: uses: thedoctor0/zip-release@master with: type: '${{ matrix.compression }}' - filename: '${{ matrix.os }}.${{ matrix.format }}' - path: '${{ matrix.os }}/*' - directory: 'src/Ombi/' + filename: '../${{ matrix.os }}.${{ matrix.format }}' + path: '.' + directory: 'src/Ombi/${{ matrix.os }}' - name: Publish Release uses: actions/upload-artifact@v2 From b156a8e8117b7ea4b67af2a3da052747d25a214f Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 14:24:12 +0100 Subject: [PATCH 69/92] ci: :building_construction: Added the dotnet setversion --- .github/workflows/build.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abc04ff33..53dbddb7a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,6 +100,22 @@ jobs: restore-keys: | ${{ runner.os }}-nuget + # This is only to get the next version number so we can set the version before compile + - name: Conventional Changelog Action + uses: TriPSs/conventional-changelog-action@v3 + with: + github-token: ${{ secrets.github_token }} + skip-version-file: 'true' + skip-commit: 'true' + version-file: 'version.json' + output-file: 'false' + + - name: Set Backend Version + run: | + dotnet tool install -g dotnet-setversion + setversion -r ${{ steps.changelog.outputs.version }} + working-directory: src/Ombi + - name: Publish Backend ${{ matrix.os }} run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true working-directory: src/Ombi @@ -120,14 +136,6 @@ jobs: cd .. echo "Copy dist to /ClientApp" sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp/dist - cd ${{ matrix.os }} - echo "List OS folder" - ls - echo "list Clientapp" - cd ClientApp - ls - echo "list root" - ls ~/ working-directory: src/Ombi - name: Archive Release From d3db786ef3bd2a8a69a8862ec0b7318b51bb8fad Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 14:35:44 +0100 Subject: [PATCH 70/92] ci: :building_construction: --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53dbddb7a..59045a03d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -116,6 +116,11 @@ jobs: setversion -r ${{ steps.changelog.outputs.version }} working-directory: src/Ombi + - name: Output version + run: | + echo "outputs: ${{ steps.changelog.outputs }}" + echo "Version: ${{ steps.changelog.outputs.version }}" + - name: Publish Backend ${{ matrix.os }} run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true working-directory: src/Ombi From 8344e30c1f71e4ab945ef036a898b9724f356387 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 14:39:10 +0100 Subject: [PATCH 71/92] ci: :building_construction: --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59045a03d..3e4dde8ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -110,17 +110,17 @@ jobs: version-file: 'version.json' output-file: 'false' + - name: Output version + run: | + echo "outputs: ${{ steps.changelog.outputs }}" + echo "Version: ${{ steps.changelog.outputs.version }}" + - name: Set Backend Version run: | dotnet tool install -g dotnet-setversion setversion -r ${{ steps.changelog.outputs.version }} working-directory: src/Ombi - - name: Output version - run: | - echo "outputs: ${{ steps.changelog.outputs }}" - echo "Version: ${{ steps.changelog.outputs.version }}" - - name: Publish Backend ${{ matrix.os }} run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true working-directory: src/Ombi From 504e98bccf86810683e00528457a92f88b487474 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 14:54:52 +0100 Subject: [PATCH 72/92] ci: :building_construction: --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e4dde8ec..5fd032393 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,6 +102,7 @@ jobs: # This is only to get the next version number so we can set the version before compile - name: Conventional Changelog Action + id: pre-build-changelog uses: TriPSs/conventional-changelog-action@v3 with: github-token: ${{ secrets.github_token }} @@ -112,13 +113,13 @@ jobs: - name: Output version run: | - echo "outputs: ${{ steps.changelog.outputs }}" - echo "Version: ${{ steps.changelog.outputs.version }}" + echo "outputs: ${{ steps.pre-build-changelog.outputs }}" + echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" - name: Set Backend Version run: | dotnet tool install -g dotnet-setversion - setversion -r ${{ steps.changelog.outputs.version }} + setversion -r ${{ steps.pre-build-changelog.outputs.version }} working-directory: src/Ombi - name: Publish Backend ${{ matrix.os }} From 4d5cb3e1d343a63ca537439de4b2b786b14f5bd0 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:02:54 +0100 Subject: [PATCH 73/92] ci: :building_construction: --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5fd032393..7ddd0bfbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,6 +65,27 @@ jobs: # # Use always() to always run this step to publish test results when there are test failures # if: ${{ always() }} + versioning: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + # This is only to get the next version number so we can set the version before compile + - name: Conventional Changelog Action + id: pre-build-changelog + uses: TriPSs/conventional-changelog-action@v3 + with: + github-token: ${{ secrets.github_token }} + skip-version-file: 'true' + skip-commit: 'true' + version-file: 'version.json' + output-file: 'false' + + - name: Output version + run: | + echo "outputs: ${{ steps.pre-build-changelog.outputs }}" + echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" + echo "Version: ${{ steps.pre-build-changelog.outputs.tag }}" + publish: runs-on: ubuntu-latest needs: [ build-ui ] @@ -115,6 +136,7 @@ jobs: run: | echo "outputs: ${{ steps.pre-build-changelog.outputs }}" echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" + echo "Version: ${{ steps.pre-build-changelog.outputs.tag }}" - name: Set Backend Version run: | From 9376a0bf9ff0185563d0ba14eb4819c23bc4d0bb Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:08:42 +0100 Subject: [PATCH 74/92] ci: :building_construction: --- .github/workflows/build.yml | 210 ++++++++++++++++++------------------ 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ddd0bfbc..ad7bab84e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: - uses: actions/checkout@v2 # This is only to get the next version number so we can set the version before compile - name: Conventional Changelog Action - id: pre-build-changelog + id: changelog uses: TriPSs/conventional-changelog-action@v3 with: github-token: ${{ secrets.github_token }} @@ -82,122 +82,122 @@ jobs: - name: Output version run: | - echo "outputs: ${{ steps.pre-build-changelog.outputs }}" - echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" - echo "Version: ${{ steps.pre-build-changelog.outputs.tag }}" + echo "outputs: ${{ steps.changelog.outputs.tag }}" + echo "Version: $${{ steps.changelog.outputs.version }}" + echo "log: ${{ steps.changelog.outputs.clean_changelog }}" - publish: - runs-on: ubuntu-latest - needs: [ build-ui ] - strategy: - matrix: - include: - - os: win10-x64 - format: zip - compression: zip - - os: win10-x86 - format: zip - compression: zip - - os: linux-x64 - format: tar.gz - compression: tar - - os: linux-arm - format: tar.gz - compression: tar - - os: linux-arm64 - compression: tar - format: tar.gz - - os: osx-x64 - compression: tar - format: tar.gz - steps: - - uses: actions/checkout@v2 + # publish: + # runs-on: ubuntu-latest + # needs: [ build-ui ] + # strategy: + # matrix: + # include: + # - os: win10-x64 + # format: zip + # compression: zip + # - os: win10-x86 + # format: zip + # compression: zip + # - os: linux-x64 + # format: tar.gz + # compression: tar + # - os: linux-arm + # format: tar.gz + # compression: tar + # - os: linux-arm64 + # compression: tar + # format: tar.gz + # - os: osx-x64 + # compression: tar + # format: tar.gz + # steps: + # - uses: actions/checkout@v2 - - name: Nuget Cache - uses: actions/cache@v2 - with: - path: ~/.nuget/packages - key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} - restore-keys: | - ${{ runner.os }}-nuget + # - name: Nuget Cache + # uses: actions/cache@v2 + # with: + # path: ~/.nuget/packages + # key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + # restore-keys: | + # ${{ runner.os }}-nuget - # This is only to get the next version number so we can set the version before compile - - name: Conventional Changelog Action - id: pre-build-changelog - uses: TriPSs/conventional-changelog-action@v3 - with: - github-token: ${{ secrets.github_token }} - skip-version-file: 'true' - skip-commit: 'true' - version-file: 'version.json' - output-file: 'false' + # # This is only to get the next version number so we can set the version before compile + # - name: Conventional Changelog Action + # id: pre-build-changelog + # uses: TriPSs/conventional-changelog-action@v3 + # with: + # github-token: ${{ secrets.github_token }} + # skip-version-file: 'true' + # skip-commit: 'true' + # version-file: 'version.json' + # output-file: 'false' - - name: Output version - run: | - echo "outputs: ${{ steps.pre-build-changelog.outputs }}" - echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" - echo "Version: ${{ steps.pre-build-changelog.outputs.tag }}" + # - name: Output version + # run: | + # echo "outputs: ${{ steps.pre-build-changelog.outputs }}" + # echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" + # echo "Version: ${{ steps.pre-build-changelog.outputs.tag }}" - - name: Set Backend Version - run: | - dotnet tool install -g dotnet-setversion - setversion -r ${{ steps.pre-build-changelog.outputs.version }} - working-directory: src/Ombi + # - name: Set Backend Version + # run: | + # dotnet tool install -g dotnet-setversion + # setversion -r ${{ steps.pre-build-changelog.outputs.version }} + # working-directory: src/Ombi - - name: Publish Backend ${{ matrix.os }} - run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true - working-directory: src/Ombi + # - name: Publish Backend ${{ matrix.os }} + # run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true + # working-directory: src/Ombi - - name: Download Angular - uses: actions/download-artifact@v2 - with: - name: angular_dist - path: ~/src/Ombi/dist + # - name: Download Angular + # uses: actions/download-artifact@v2 + # with: + # name: angular_dist + # path: ~/src/Ombi/dist - - name: Copy Dist to Artifacts - run: | - cd ${{ matrix.os }} - sudo mkdir -p ClientApp/dist - echo "mkdir /ClientApp" - echo "list os (ClientApp should be here)" - ls - cd .. - echo "Copy dist to /ClientApp" - sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp/dist - working-directory: src/Ombi + # - name: Copy Dist to Artifacts + # run: | + # cd ${{ matrix.os }} + # sudo mkdir -p ClientApp/dist + # echo "mkdir /ClientApp" + # echo "list os (ClientApp should be here)" + # ls + # cd .. + # echo "Copy dist to /ClientApp" + # sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp/dist + # working-directory: src/Ombi - - name: Archive Release - uses: thedoctor0/zip-release@master - with: - type: '${{ matrix.compression }}' - filename: '../${{ matrix.os }}.${{ matrix.format }}' - path: '.' - directory: 'src/Ombi/${{ matrix.os }}' + # - name: Archive Release + # uses: thedoctor0/zip-release@master + # with: + # type: '${{ matrix.compression }}' + # filename: '../${{ matrix.os }}.${{ matrix.format }}' + # path: '.' + # directory: 'src/Ombi/${{ matrix.os }}' - - name: Publish Release - uses: actions/upload-artifact@v2 - with: - name: ${{ matrix.os }} - path: | - ./src/Ombi/${{ matrix.os }}.${{ matrix.format }} + # - name: Publish Release + # uses: actions/upload-artifact@v2 + # with: + # name: ${{ matrix.os }} + # path: | + # ./src/Ombi/${{ matrix.os }}.${{ matrix.format }} - release: - needs: [ publish, unit-test ] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Conventional Changelog Action - uses: TriPSs/conventional-changelog-action@v3 - with: - github-token: ${{ secrets.github_token }} - git-message: 'chore(release): {version}' - version-file: 'version.json' - output-file: 'CHANGELOG.md' + # release: + # needs: [ publish, unit-test ] + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # - name: Conventional Changelog Action + # uses: TriPSs/conventional-changelog-action@v3 + # with: + # github-token: ${{ secrets.github_token }} + # git-message: 'chore(release): {version}' + # version-file: 'version.json' + # output-file: 'CHANGELOG.md' - - name: Download Artifacts - uses: actions/download-artifact@v2 - with: - path: artifacts + # - name: Download Artifacts + # uses: actions/download-artifact@v2 + # with: + # path: artifacts From 18f64226186c24d12357e3a9614e7ade84ccf26e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:10:05 +0100 Subject: [PATCH 75/92] ci: :building_construction: --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad7bab84e..f2f78dbb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,6 +79,7 @@ jobs: skip-commit: 'true' version-file: 'version.json' output-file: 'false' + skip-on-empty: 'false' - name: Output version run: | From 7d98a295411d9498d807e47bd5dc8d66a2070c44 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:13:57 +0100 Subject: [PATCH 76/92] ci: :building_construction: --- .github/workflows/build.yml | 221 ++++++++++++++++++------------------ 1 file changed, 111 insertions(+), 110 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2f78dbb5..1f7ca39f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,13 +65,66 @@ jobs: # # Use always() to always run this step to publish test results when there are test failures # if: ${{ always() }} - versioning: + # versioning: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v2 + # # This is only to get the next version number so we can set the version before compile + # - name: Conventional Changelog Action + # id: changelog + # uses: TriPSs/conventional-changelog-action@v3 + # with: + # github-token: ${{ secrets.github_token }} + # skip-version-file: 'true' + # skip-commit: 'true' + # version-file: 'version.json' + # output-file: 'false' + # skip-on-empty: 'false' + + # - name: Output version + # run: | + # echo "outputs: ${{ steps.changelog.outputs.tag }}" + # echo "Version: ${{ steps.changelog.outputs.version }}" + # echo "log: ${{ steps.changelog.outputs.clean_changelog }}" + + publish: runs-on: ubuntu-latest + needs: [ build-ui ] + strategy: + matrix: + include: + - os: win10-x64 + format: zip + compression: zip + - os: win10-x86 + format: zip + compression: zip + - os: linux-x64 + format: tar.gz + compression: tar + - os: linux-arm + format: tar.gz + compression: tar + - os: linux-arm64 + compression: tar + format: tar.gz + - os: osx-x64 + compression: tar + format: tar.gz steps: - uses: actions/checkout@v2 + + - name: Nuget Cache + uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget + # This is only to get the next version number so we can set the version before compile - name: Conventional Changelog Action - id: changelog + id: pre-build-changelog uses: TriPSs/conventional-changelog-action@v3 with: github-token: ${{ secrets.github_token }} @@ -83,122 +136,70 @@ jobs: - name: Output version run: | - echo "outputs: ${{ steps.changelog.outputs.tag }}" - echo "Version: $${{ steps.changelog.outputs.version }}" - echo "log: ${{ steps.changelog.outputs.clean_changelog }}" + echo "outputs: ${{ steps.pre-build-changelog.outputs }}" + echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" + echo "Version: ${{ steps.pre-build-changelog.outputs.tag }}" - # publish: - # runs-on: ubuntu-latest - # needs: [ build-ui ] - # strategy: - # matrix: - # include: - # - os: win10-x64 - # format: zip - # compression: zip - # - os: win10-x86 - # format: zip - # compression: zip - # - os: linux-x64 - # format: tar.gz - # compression: tar - # - os: linux-arm - # format: tar.gz - # compression: tar - # - os: linux-arm64 - # compression: tar - # format: tar.gz - # - os: osx-x64 - # compression: tar - # format: tar.gz - # steps: - # - uses: actions/checkout@v2 + - name: Set Backend Version + run: | + dotnet tool install -g dotnet-setversion + setversion -r ${{ steps.pre-build-changelog.outputs.version }} + working-directory: src/Ombi - # - name: Nuget Cache - # uses: actions/cache@v2 - # with: - # path: ~/.nuget/packages - # key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} - # restore-keys: | - # ${{ runner.os }}-nuget + - name: Publish Backend ${{ matrix.os }} + run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true + working-directory: src/Ombi - # # This is only to get the next version number so we can set the version before compile - # - name: Conventional Changelog Action - # id: pre-build-changelog - # uses: TriPSs/conventional-changelog-action@v3 - # with: - # github-token: ${{ secrets.github_token }} - # skip-version-file: 'true' - # skip-commit: 'true' - # version-file: 'version.json' - # output-file: 'false' + - name: Download Angular + uses: actions/download-artifact@v2 + with: + name: angular_dist + path: ~/src/Ombi/dist - # - name: Output version - # run: | - # echo "outputs: ${{ steps.pre-build-changelog.outputs }}" - # echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" - # echo "Version: ${{ steps.pre-build-changelog.outputs.tag }}" + - name: Copy Dist to Artifacts + run: | + cd ${{ matrix.os }} + sudo mkdir -p ClientApp/dist + echo "mkdir /ClientApp" + echo "list os (ClientApp should be here)" + ls + cd .. + echo "Copy dist to /ClientApp" + sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp/dist + working-directory: src/Ombi - # - name: Set Backend Version - # run: | - # dotnet tool install -g dotnet-setversion - # setversion -r ${{ steps.pre-build-changelog.outputs.version }} - # working-directory: src/Ombi + - name: Archive Release + uses: thedoctor0/zip-release@master + with: + type: '${{ matrix.compression }}' + filename: '../${{ matrix.os }}.${{ matrix.format }}' + path: '.' + directory: 'src/Ombi/${{ matrix.os }}' - # - name: Publish Backend ${{ matrix.os }} - # run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true - # working-directory: src/Ombi + - name: Publish Release + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.os }} + path: | + ./src/Ombi/${{ matrix.os }}.${{ matrix.format }} - # - name: Download Angular - # uses: actions/download-artifact@v2 - # with: - # name: angular_dist - # path: ~/src/Ombi/dist + release: + needs: [ publish, unit-test ] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Conventional Changelog Action + uses: TriPSs/conventional-changelog-action@v3 + with: + github-token: ${{ secrets.github_token }} + git-message: 'chore(release): {version}' + version-file: 'version.json' + output-file: 'CHANGELOG.md' - # - name: Copy Dist to Artifacts - # run: | - # cd ${{ matrix.os }} - # sudo mkdir -p ClientApp/dist - # echo "mkdir /ClientApp" - # echo "list os (ClientApp should be here)" - # ls - # cd .. - # echo "Copy dist to /ClientApp" - # sudo mv ~/src/Ombi/dist/* ${{ matrix.os }}/ClientApp/dist - # working-directory: src/Ombi - - # - name: Archive Release - # uses: thedoctor0/zip-release@master - # with: - # type: '${{ matrix.compression }}' - # filename: '../${{ matrix.os }}.${{ matrix.format }}' - # path: '.' - # directory: 'src/Ombi/${{ matrix.os }}' - - # - name: Publish Release - # uses: actions/upload-artifact@v2 - # with: - # name: ${{ matrix.os }} - # path: | - # ./src/Ombi/${{ matrix.os }}.${{ matrix.format }} - - # release: - # needs: [ publish, unit-test ] - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - # - name: Conventional Changelog Action - # uses: TriPSs/conventional-changelog-action@v3 - # with: - # github-token: ${{ secrets.github_token }} - # git-message: 'chore(release): {version}' - # version-file: 'version.json' - # output-file: 'CHANGELOG.md' - - # - name: Download Artifacts - # uses: actions/download-artifact@v2 - # with: - # path: artifacts + - name: Download Artifacts + uses: actions/download-artifact@v2 + with: + path: artifacts From 5e7550cae1bae38edaee291a62f87397ec9160dd Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:19:08 +0100 Subject: [PATCH 77/92] ci: :building_construction: --- .github/workflows/build.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f7ca39f2..198a2f3ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,17 +134,11 @@ jobs: output-file: 'false' skip-on-empty: 'false' - - name: Output version - run: | - echo "outputs: ${{ steps.pre-build-changelog.outputs }}" - echo "Version: ${{ steps.pre-build-changelog.outputs.version }}" - echo "Version: ${{ steps.pre-build-changelog.outputs.tag }}" - - name: Set Backend Version run: | dotnet tool install -g dotnet-setversion setversion -r ${{ steps.pre-build-changelog.outputs.version }} - working-directory: src/Ombi + working-directory: src - name: Publish Backend ${{ matrix.os }} run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true From b6c6c2af6673beb1d3ed3b9f6a6bb3d30cd92f8b Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:26:10 +0100 Subject: [PATCH 78/92] ci: :building_construction: Actually release it --- .github/workflows/build.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 198a2f3ca..065701347 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -183,6 +183,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Conventional Changelog Action + id: changelog uses: TriPSs/conventional-changelog-action@v3 with: github-token: ${{ secrets.github_token }} @@ -194,7 +195,22 @@ jobs: uses: actions/download-artifact@v2 with: path: artifacts - + + - name: Publish to GitHub + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + body: ${{ steps.changelog.outputs.clean_changelog }} + prerelease: 'true' + name: ${{ steps.changelog.outputs.tag }} + tag_name: ${{ steps.changelog.outputs.tag }} + files: | + linux-arm.tar.gz + linux-arm64.tar.gz + linux-x64.tar.gz + osx-x64.tar.gz + win10-x86.zip + win10-x64.zip From 4113f7e933ff7a538c0c66a1c9f89efa48973c2e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:31:11 +0100 Subject: [PATCH 79/92] ci: :building_construction: --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 065701347..53f5ab297 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -124,7 +124,7 @@ jobs: # This is only to get the next version number so we can set the version before compile - name: Conventional Changelog Action - id: pre-build-changelog + id: changelog uses: TriPSs/conventional-changelog-action@v3 with: github-token: ${{ secrets.github_token }} @@ -137,7 +137,7 @@ jobs: - name: Set Backend Version run: | dotnet tool install -g dotnet-setversion - setversion -r ${{ steps.pre-build-changelog.outputs.version }} + setversion -r ${{ steps.changelog.outputs.version }} working-directory: src - name: Publish Backend ${{ matrix.os }} From 2728914c9e293fb50966c571a0fb68ddbc8b7e15 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:40:21 +0100 Subject: [PATCH 80/92] ci: :building_construction: --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53f5ab297..dd8a93b5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -198,10 +198,10 @@ jobs: - name: Publish to GitHub uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') + # if: startsWith(github.ref, 'refs/tags/') with: body: ${{ steps.changelog.outputs.clean_changelog }} - prerelease: 'true' + draft: 'true' name: ${{ steps.changelog.outputs.tag }} tag_name: ${{ steps.changelog.outputs.tag }} files: | From 698341268181f8434ec45eb5abd168c104d7fbbf Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:46:07 +0100 Subject: [PATCH 81/92] ci: :building_construction: added pr workflow --- .github/workflows/pr.yml | 99 ++++++++++++++++++++++++++++++++++++++++ version.json | 2 +- 2 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/pr.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 000000000..dc96bf9fa --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,99 @@ +name: PR Build + +on: + pull_request: + branches: [ develop ] + +jobs: + build-ui: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: '14' + + - name: NodeModules Cache + uses: actions/cache@v2 + with: + path: '**/node_modules' + key: node_modules-${{ hashFiles('**/yarn.lock') }} + + - name: UI Install + run: yarn --cwd ./src/Ombi/ClientApp install + + - name: Build UI + run: yarn --cwd ./src/Ombi/ClientApp run build + + unit-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-dotnet@v1 + with: + dotnet-version: '5.0.x' + + - name: Nuget Cache + uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget + + - name: Run Unit Tests + run: | + cd src + dotnet test --logger trx --results-directory "TestResults" + + ## Don't need yet + # - name: Upload dotnet test results + # uses: actions/upload-artifact@v2 + # with: + # name: dotnet-results + # path: src/TestResults + # # Use always() to always run this step to publish test results when there are test failures + # if: ${{ always() }} + + + publish: + runs-on: ubuntu-latest + needs: [ build-ui ] + strategy: + matrix: + include: + - os: win10-x64 + format: zip + compression: zip + - os: win10-x86 + format: zip + compression: zip + - os: linux-x64 + format: tar.gz + compression: tar + - os: linux-arm + format: tar.gz + compression: tar + - os: linux-arm64 + compression: tar + format: tar.gz + - os: osx-x64 + compression: tar + format: tar.gz + steps: + - uses: actions/checkout@v2 + + - name: Nuget Cache + uses: actions/cache@v2 + with: + path: ~/.nuget/packages + key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }} + restore-keys: | + ${{ runner.os }}-nuget + + - name: Publish Backend ${{ matrix.os }} + run: dotnet publish -c Release -r ${{ matrix.os }} -o "${{ matrix.os }}" --self-contained true -p:PublishSingleFile=true + working-directory: src/Ombi + + + diff --git a/version.json b/version.json index b58d89507..36d3def02 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.1.2" + "version": "4.1.8" } \ No newline at end of file From a2498051cfd679dd19206571883a08d77e159e2b Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 15:59:15 +0100 Subject: [PATCH 82/92] fix: :bug: Upload the correct artifacts --- .github/workflows/build.yml | 8 ++------ .github/workflows/codeql-analysis.yml | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd8a93b5b..2e4fa64e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -205,12 +205,8 @@ jobs: name: ${{ steps.changelog.outputs.tag }} tag_name: ${{ steps.changelog.outputs.tag }} files: | - linux-arm.tar.gz - linux-arm64.tar.gz - linux-x64.tar.gz - osx-x64.tar.gz - win10-x86.zip - win10-x64.zip + artifacts/**.tar.gz + artifacts/**.zip diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 613ccc14f..8c870059c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,8 +17,6 @@ on: pull_request: # The branches below must be a subset of the branches above branches: [ develop ] - schedule: - - cron: '40 3 * * 4' jobs: analyze: From a7d97179d72907e757b61830ea197649c521a2b6 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 16:06:38 +0100 Subject: [PATCH 83/92] ci: :building_construction: --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e4fa64e3..7d26462e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -205,8 +205,8 @@ jobs: name: ${{ steps.changelog.outputs.tag }} tag_name: ${{ steps.changelog.outputs.tag }} files: | - artifacts/**.tar.gz - artifacts/**.zip + artifacts/*.tar.gz + artifacts/*.zip From fb9ff4ccde9121dce6da379198de225686123457 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 16:16:26 +0100 Subject: [PATCH 84/92] fix: try and fix the artifact upload --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d26462e8..b545832ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -205,8 +205,12 @@ jobs: name: ${{ steps.changelog.outputs.tag }} tag_name: ${{ steps.changelog.outputs.tag }} files: | - artifacts/*.tar.gz - artifacts/*.zip + artifacts/linux-arm.tar.gz + artifacts/linux-arm64.tar.gz + artifacts/linux-x64.tar.gz + artifacts/osx-x64.tar.gz + artifacts/win10-x86.zip + artifacts/win10-x64.zip From 5207b21f2f98cc63f16a72bd79ecac6abf838139 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 16:21:54 +0100 Subject: [PATCH 85/92] fix: :bug: bump ver --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 36d3def02..2233f4602 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.1.8" + "version": "4.1.11" } \ No newline at end of file From e5026abdd683d1907cc333ab4e5863fc9bead00c Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 16:32:13 +0100 Subject: [PATCH 86/92] ci: :building_construction: --- .github/workflows/build.yml | 51 ++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b545832ff..c584bdd62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -182,35 +182,40 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Conventional Changelog Action - id: changelog - uses: TriPSs/conventional-changelog-action@v3 - with: - github-token: ${{ secrets.github_token }} - git-message: 'chore(release): {version}' - version-file: 'version.json' - output-file: 'CHANGELOG.md' + # - name: Conventional Changelog Action + # id: changelog + # uses: TriPSs/conventional-changelog-action@v3 + # with: + # github-token: ${{ secrets.github_token }} + # git-message: 'chore(release): {version}' + # version-file: 'version.json' + # output-file: 'CHANGELOG.md' - name: Download Artifacts + id: download uses: actions/download-artifact@v2 with: path: artifacts - - name: Publish to GitHub - uses: softprops/action-gh-release@v1 - # if: startsWith(github.ref, 'refs/tags/') - with: - body: ${{ steps.changelog.outputs.clean_changelog }} - draft: 'true' - name: ${{ steps.changelog.outputs.tag }} - tag_name: ${{ steps.changelog.outputs.tag }} - files: | - artifacts/linux-arm.tar.gz - artifacts/linux-arm64.tar.gz - artifacts/linux-x64.tar.gz - artifacts/osx-x64.tar.gz - artifacts/win10-x86.zip - artifacts/win10-x64.zip + - name: Display structure of downloaded files + run: ls -R + working-directory: artifacts + + # - name: Publish to GitHub + # uses: softprops/action-gh-release@v1 + # # if: startsWith(github.ref, 'refs/tags/') + # with: + # body: ${{ steps.changelog.outputs.clean_changelog }} + # draft: 'true' + # name: ${{ steps.changelog.outputs.tag }} + # tag_name: ${{ steps.changelog.outputs.tag }} + # files: | + # artifacts/linux-arm.tar.gz + # artifacts/linux-arm64.tar.gz + # artifacts/linux-x64.tar.gz + # artifacts/osx-x64.tar.gz + # artifacts/win10-x86.zip + # artifacts/win10-x64.zip From 97987d0ce61604719e29556934399af85aa027c5 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 29 Sep 2021 16:39:44 +0100 Subject: [PATCH 87/92] ci: :building_construction: --- .github/workflows/build.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c584bdd62..215201182 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -197,10 +197,6 @@ jobs: with: path: artifacts - - name: Display structure of downloaded files - run: ls -R - working-directory: artifacts - # - name: Publish to GitHub # uses: softprops/action-gh-release@v1 # # if: startsWith(github.ref, 'refs/tags/') @@ -210,12 +206,19 @@ jobs: # name: ${{ steps.changelog.outputs.tag }} # tag_name: ${{ steps.changelog.outputs.tag }} # files: | - # artifacts/linux-arm.tar.gz - # artifacts/linux-arm64.tar.gz - # artifacts/linux-x64.tar.gz - # artifacts/osx-x64.tar.gz - # artifacts/win10-x86.zip - # artifacts/win10-x64.zip + # artifacts/**/*.tar.gz + # artifacts/**/*.zip + + - name: Publish to GitHub + uses: softprops/action-gh-release@v1 + # if: startsWith(github.ref, 'refs/tags/') + with: + body: 'Test' + draft: 'true' + name: 'Test' + files: | + artifacts/**/*.tar.gz + artifacts/**/*.zip From 1fda2a1d37c1182177fdca55e38b98a85dc1fe05 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 1 Oct 2021 16:44:43 +0100 Subject: [PATCH 88/92] fix: :bug: Stop Devops from building and releasing, GH Actions will now call the APT Build --- .azuredevops/pipelines/publish-job.yml | 130 ++++++++++++------------- .github/workflows/build.yml | 56 ++++++----- 2 files changed, 96 insertions(+), 90 deletions(-) diff --git a/.azuredevops/pipelines/publish-job.yml b/.azuredevops/pipelines/publish-job.yml index 78697830b..435582858 100644 --- a/.azuredevops/pipelines/publish-job.yml +++ b/.azuredevops/pipelines/publish-job.yml @@ -45,74 +45,74 @@ stages: steps: - template: templates/publish-os-steps.yml -- stage: deploy - jobs: - - job: - condition: and(succeeded(), eq(variables.isMain, true)) - steps: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'current' - targetPath: '$(System.ArtifactsDirectory)' +# - stage: deploy +# jobs: +# - job: +# condition: and(succeeded(), eq(variables.isMain, true)) +# steps: +# - task: DownloadPipelineArtifact@2 +# inputs: +# buildType: 'current' +# targetPath: '$(System.ArtifactsDirectory)' - - task: PowerShell@2 - displayName: 'Get Release Notes' - inputs: - targetType: 'inline' - script: | - $response = Invoke-WebRequest -Uri "https://ombireleasenote.azurewebsites.net/api/ReleaseNotesFunction?buildId=$(Build.BuildId)" - Write-Host "##vso[task.setvariable variable=ReleaseNotes;]$response" +# - task: PowerShell@2 +# displayName: 'Get Release Notes' +# inputs: +# targetType: 'inline' +# script: | +# $response = Invoke-WebRequest -Uri "https://ombireleasenote.azurewebsites.net/api/ReleaseNotesFunction?buildId=$(Build.BuildId)" +# Write-Host "##vso[task.setvariable variable=ReleaseNotes;]$response" - - task: GitHubRelease@1 - displayName: 'Ombi.Releases Release' - inputs: - gitHubConnection: 'PAT' - repositoryName: 'Ombi-app/Ombi.Releases' - action: 'create' - target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672' - tagSource: 'userSpecifiedTag' - tag: '$(gitTag)' - releaseNotesSource: 'inline' - releaseNotesInline: '$(ReleaseNotes)' - assets: | - $(System.ArtifactsDirectory)/**/*.zip - $(System.ArtifactsDirectory)/**/*.tar.gz - isPreRelease: true - changeLogCompareToRelease: 'lastNonDraftRelease' - changeLogType: 'commitBased' +# - task: GitHubRelease@1 +# displayName: 'Ombi.Releases Release' +# inputs: +# gitHubConnection: 'PAT' +# repositoryName: 'Ombi-app/Ombi.Releases' +# action: 'create' +# target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672' +# tagSource: 'userSpecifiedTag' +# tag: '$(gitTag)' +# releaseNotesSource: 'inline' +# releaseNotesInline: '$(ReleaseNotes)' +# assets: | +# $(System.ArtifactsDirectory)/**/*.zip +# $(System.ArtifactsDirectory)/**/*.tar.gz +# isPreRelease: true +# changeLogCompareToRelease: 'lastNonDraftRelease' +# changeLogType: 'commitBased' - - task: GitHubRelease@1 - displayName: 'Ombi Release' - inputs: - gitHubConnection: 'PAT' - repositoryName: 'Ombi-app/Ombi' - action: 'create' - target: '$(Build.SourceVersion)' - tagSource: 'userSpecifiedTag' - tag: '$(gitTag)' - releaseNotesSource: 'inline' - releaseNotesInline: '$(ReleaseNotes)' - assets: | - $(System.ArtifactsDirectory)/**/*.zip - $(System.ArtifactsDirectory)/**/*.tar.gz - isPreRelease: true - changeLogCompareToRelease: 'lastNonDraftRelease' - changeLogType: 'commitBased' +# - task: GitHubRelease@1 +# displayName: 'Ombi Release' +# inputs: +# gitHubConnection: 'PAT' +# repositoryName: 'Ombi-app/Ombi' +# action: 'create' +# target: '$(Build.SourceVersion)' +# tagSource: 'userSpecifiedTag' +# tag: '$(gitTag)' +# releaseNotesSource: 'inline' +# releaseNotesInline: '$(ReleaseNotes)' +# assets: | +# $(System.ArtifactsDirectory)/**/*.zip +# $(System.ArtifactsDirectory)/**/*.tar.gz +# isPreRelease: true +# changeLogCompareToRelease: 'lastNonDraftRelease' +# changeLogType: 'commitBased' - - task: PowerShell@2 - displayName: "Trigger APT build" - inputs: - targetType: 'inline' - script: | - $body = @{ - "ref"="main" - "inputs"= @{"version"= "$(gitTag)"} - } | ConvertTo-Json +# - task: PowerShell@2 +# displayName: "Trigger APT build" +# inputs: +# targetType: 'inline' +# script: | +# $body = @{ +# "ref"="main" +# "inputs"= @{"version"= "$(gitTag)"} +# } | ConvertTo-Json - $header = @{ - "Accept"="application/vnd.github.v3+json" - "Authorization"="Bearer $(APTPAT)" - "User-Agent"="Ombi" - } +# $header = @{ +# "Accept"="application/vnd.github.v3+json" +# "Authorization"="Bearer $(APTPAT)" +# "User-Agent"="Ombi" +# } - Invoke-RestMethod -Uri "https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches" -Method 'Post' -Body $body -Headers $header \ No newline at end of file +# Invoke-RestMethod -Uri "https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches" -Method 'Post' -Body $body -Headers $header \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 215201182..17ad0c3bb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,8 +4,6 @@ on: push: # branches: [ develop, feature/** ] branches: [ releaseNotes ] - pull_request: - branches: [ develop ] jobs: build-ui: @@ -182,14 +180,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - # - name: Conventional Changelog Action - # id: changelog - # uses: TriPSs/conventional-changelog-action@v3 - # with: - # github-token: ${{ secrets.github_token }} - # git-message: 'chore(release): {version}' - # version-file: 'version.json' - # output-file: 'CHANGELOG.md' + - name: Conventional Changelog Action + id: changelog + uses: TriPSs/conventional-changelog-action@v3 + with: + github-token: ${{ secrets.github_token }} + git-message: 'chore(release): {version}' + version-file: 'version.json' + output-file: 'CHANGELOG.md' - name: Download Artifacts id: download @@ -197,28 +195,36 @@ jobs: with: path: artifacts - # - name: Publish to GitHub - # uses: softprops/action-gh-release@v1 - # # if: startsWith(github.ref, 'refs/tags/') - # with: - # body: ${{ steps.changelog.outputs.clean_changelog }} - # draft: 'true' - # name: ${{ steps.changelog.outputs.tag }} - # tag_name: ${{ steps.changelog.outputs.tag }} - # files: | - # artifacts/**/*.tar.gz - # artifacts/**/*.zip - - name: Publish to GitHub uses: softprops/action-gh-release@v1 - # if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/') with: - body: 'Test' + body: ${{ steps.changelog.outputs.clean_changelog }} draft: 'true' - name: 'Test' + name: ${{ steps.changelog.outputs.tag }} + tag_name: ${{ steps.changelog.outputs.tag }} files: | artifacts/**/*.tar.gz artifacts/**/*.zip + # - name: Publish to GitHub + # uses: softprops/action-gh-release@v1 + # # if: startsWith(github.ref, 'refs/tags/') + # with: + # body: 'Test' + # draft: 'true' + # name: 'Test' + # files: | + # artifacts/**/*.tar.gz + # artifacts/**/*.zip + + - name: Trigger APT Build + uses: fjogeleit/http-request-action@master + with: + url: 'https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches' + method: 'POST' + contentType: 'application/json' + data: "{ 'ref':'main', 'inputs': { 'version': '${{ steps.changelog.outputs.tag }}'} }" + customHeaders: "{'Accept':'application/vnd.github.v3+json', 'Authorization':'Bearer ${{secrets.APT_PAT}}', 'User-Agent':'Ombi'}" From 1a7b9b50578675532fdb0f656cbaf51306166b84 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 1 Oct 2021 16:49:17 +0100 Subject: [PATCH 89/92] fix: :bookmark: Set version to correct number --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 2233f4602..55ed62a29 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.1.11" + "version": "4.0.1506" } \ No newline at end of file From 9287d83c134e62c9f0a5d271cfd88eefc9dcae39 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 1 Oct 2021 16:59:06 +0100 Subject: [PATCH 90/92] fix: :bug: Set the real tag version now --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 55ed62a29..e0fcdb6c3 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.0.1506" + "version": "4.0.1509" } \ No newline at end of file From 44e573d993f8aeed390d0dbd913bcf0e6a6d7469 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 6 Oct 2021 20:31:15 +0100 Subject: [PATCH 91/92] ci: :construction_worker: Finished build and PR pipelines --- .github/workflows/build.yml | 170 ++++++++++++++++++------------------ .github/workflows/pr.yml | 29 +++--- 2 files changed, 104 insertions(+), 95 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17ad0c3bb..0c5662207 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,8 +2,7 @@ name: CI Build on: push: - # branches: [ develop, feature/** ] - branches: [ releaseNotes ] + branches: [ develop, master ] jobs: build-ui: @@ -54,40 +53,35 @@ jobs: cd src dotnet test --logger trx --results-directory "TestResults" - ## Don't need yet - # - name: Upload dotnet test results - # uses: actions/upload-artifact@v2 - # with: - # name: dotnet-results - # path: src/TestResults - # # Use always() to always run this step to publish test results when there are test failures - # if: ${{ always() }} + versioning: + runs-on: ubuntu-latest + outputs: + changelog: ${{ steps.changelog.outputs.clean_changelog }} + tag: ${{ steps.changelog.outputs.tag }} + version: ${{ steps.changelog.outputs.version }} + steps: + - uses: actions/checkout@v2 + # This is only to get the next version number so we can set the version before compile + - name: Conventional Changelog Action + id: changelog + uses: TriPSs/conventional-changelog-action@v3 + with: + skip-version-file: 'true' + skip-commit: 'true' + version-file: 'version.json' + output-file: 'false' + skip-on-empty: 'false' + git-push: 'false' - # versioning: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - # # This is only to get the next version number so we can set the version before compile - # - name: Conventional Changelog Action - # id: changelog - # uses: TriPSs/conventional-changelog-action@v3 - # with: - # github-token: ${{ secrets.github_token }} - # skip-version-file: 'true' - # skip-commit: 'true' - # version-file: 'version.json' - # output-file: 'false' - # skip-on-empty: 'false' - - # - name: Output version - # run: | - # echo "outputs: ${{ steps.changelog.outputs.tag }}" - # echo "Version: ${{ steps.changelog.outputs.version }}" - # echo "log: ${{ steps.changelog.outputs.clean_changelog }}" + - name: Output version + run: | + echo "outputs: ${{ steps.changelog.outputs.tag }}" + echo "Version: ${{ steps.changelog.outputs.version }}" + echo "log: ${{ steps.changelog.outputs.clean_changelog }}" publish: runs-on: ubuntu-latest - needs: [ build-ui ] + needs: [ build-ui, versioning ] strategy: matrix: include: @@ -120,22 +114,22 @@ jobs: restore-keys: | ${{ runner.os }}-nuget - # This is only to get the next version number so we can set the version before compile - - name: Conventional Changelog Action - id: changelog - uses: TriPSs/conventional-changelog-action@v3 - with: - github-token: ${{ secrets.github_token }} - skip-version-file: 'true' - skip-commit: 'true' - version-file: 'version.json' - output-file: 'false' - skip-on-empty: 'false' + # - name: Conventional Changelog Action + # id: changelog + # uses: TriPSs/conventional-changelog-action@v3.7.1 + # with: + # github-token: ${{ secrets.WORKFLOW_PAT }} + # git-message: 'chore(release): {version}' + # version-file: 'version.json' + # output-file: 'CHANGELOG.md' + # skip-on-empty: 'false' + #env: + # ENV: 'dont-use-git' - name: Set Backend Version run: | dotnet tool install -g dotnet-setversion - setversion -r ${{ steps.changelog.outputs.version }} + setversion -r ${{ needs.versioning.outputs.version }} working-directory: src - name: Publish Backend ${{ matrix.os }} @@ -176,7 +170,41 @@ jobs: ./src/Ombi/${{ matrix.os }}.${{ matrix.format }} release: - needs: [ publish, unit-test ] + needs: [ publish, unit-test, versioning ] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Download Artifacts + id: download + uses: actions/download-artifact@v2 + with: + path: artifacts + + - name: Publish to GitHub Master + uses: softprops/action-gh-release@v1 + if: contains(github.ref, 'master') + with: + body: ${{ needs.versioning.outputs.changelog }} + name: ${{ needs.versioning.outputs.tag }} + tag_name: ${{ needs.versioning.outputs.tag }} + files: | + artifacts/**/*.tar.gz + artifacts/**/*.zip + + - name: Publish to GitHub Develop + uses: softprops/action-gh-release@v1 + if: contains(github.ref, 'develop') + with: + prerelease: true + body: ${{ needs.versioning.outputs.changelog }} + name: ${{ needs.versioning.outputs.tag }} + tag_name: ${{ needs.versioning.outputs.tag }} + files: | + artifacts/**/*.tar.gz + artifacts/**/*.zip + + update-changelog: + needs: [ release ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -184,47 +212,21 @@ jobs: id: changelog uses: TriPSs/conventional-changelog-action@v3 with: - github-token: ${{ secrets.github_token }} - git-message: 'chore(release): {version}' version-file: 'version.json' - output-file: 'CHANGELOG.md' - - - name: Download Artifacts - id: download - uses: actions/download-artifact@v2 - with: - path: artifacts - - - name: Publish to GitHub - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - body: ${{ steps.changelog.outputs.clean_changelog }} - draft: 'true' - name: ${{ steps.changelog.outputs.tag }} - tag_name: ${{ steps.changelog.outputs.tag }} - files: | - artifacts/**/*.tar.gz - artifacts/**/*.zip - - # - name: Publish to GitHub - # uses: softprops/action-gh-release@v1 - # # if: startsWith(github.ref, 'refs/tags/') - # with: - # body: 'Test' - # draft: 'true' - # name: 'Test' - # files: | - # artifacts/**/*.tar.gz - # artifacts/**/*.zip + skip-on-empty: 'false' + git-message: 'chore(release): :rocket: {version}' + update-apt: + needs: [ release ] + runs-on: ubuntu-latest + steps: - name: Trigger APT Build - uses: fjogeleit/http-request-action@master - with: - url: 'https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches' - method: 'POST' - contentType: 'application/json' - data: "{ 'ref':'main', 'inputs': { 'version': '${{ steps.changelog.outputs.tag }}'} }" - customHeaders: "{'Accept':'application/vnd.github.v3+json', 'Authorization':'Bearer ${{secrets.APT_PAT}}', 'User-Agent':'Ombi'}" + uses: fjogeleit/http-request-action@master + with: + url: 'https://api.github.com/repos/Ombi-app/Ombi.Apt/actions/workflows/build-deb.yml/dispatches' + method: 'POST' + contentType: 'application/json' + data: "{ 'ref':'main', 'inputs': { 'version': '${{ steps.changelog.outputs.tag }}'} }" + customHeaders: "{'Accept':'application/vnd.github.v3+json', 'Authorization':'Bearer ${{secrets.APT_PAT}}', 'User-Agent':'Ombi'}" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index dc96bf9fa..e353dce4d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -2,7 +2,7 @@ name: PR Build on: pull_request: - branches: [ develop ] + types: [opened, synchronize, reopened] jobs: build-ui: @@ -46,19 +46,26 @@ jobs: cd src dotnet test --logger trx --results-directory "TestResults" - ## Don't need yet - # - name: Upload dotnet test results - # uses: actions/upload-artifact@v2 - # with: - # name: dotnet-results - # path: src/TestResults - # # Use always() to always run this step to publish test results when there are test failures - # if: ${{ always() }} - + analysis: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + # Disabling shallow clone is recommended for improving relevancy of reporting + fetch-depth: 0 + - name: SonarCloud Scan + uses: sonarsource/sonarcloud-github-action@master + with: + args: > + -Dsonar.organization=ombi-app + -Dsonar.projectKey=Ombi-app_Ombi + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} publish: runs-on: ubuntu-latest - needs: [ build-ui ] + needs: [ unit-test ] strategy: matrix: include: From 8de5e201f8530f00f42de28a132a0705f057453f Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 6 Oct 2021 20:33:21 +0100 Subject: [PATCH 92/92] chore: :fire: removed left over stuff --- .github/workflows/build.yml | 12 ----------- CHANGELOG2.md | 43 ------------------------------------- 2 files changed, 55 deletions(-) delete mode 100644 CHANGELOG2.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c5662207..09c66c1dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,18 +114,6 @@ jobs: restore-keys: | ${{ runner.os }}-nuget - # - name: Conventional Changelog Action - # id: changelog - # uses: TriPSs/conventional-changelog-action@v3.7.1 - # with: - # github-token: ${{ secrets.WORKFLOW_PAT }} - # git-message: 'chore(release): {version}' - # version-file: 'version.json' - # output-file: 'CHANGELOG.md' - # skip-on-empty: 'false' - #env: - # ENV: 'dont-use-git' - - name: Set Backend Version run: | dotnet tool install -g dotnet-setversion diff --git a/CHANGELOG2.md b/CHANGELOG2.md deleted file mode 100644 index 791ab700e..000000000 --- a/CHANGELOG2.md +++ /dev/null @@ -1,43 +0,0 @@ -## [4.1.2](https://github.com/Ombi-app/Ombi/compare/v4.1.1...v4.1.2) (2021-09-28) - - -### Bug Fixes - -* :bug: Pretending to fix a bug ([5351c14](https://github.com/Ombi-app/Ombi/commit/5351c14cb087f9ecbb37b784724bb35107d17cb8)) - - - -## [4.1.1](https://github.com/Ombi-app/Ombi/compare/v4.0.1506...v4.1.1) (2021-09-28) - - - -## [4.0.1506](https://github.com/Ombi-app/Ombi/compare/v4.0.1499...v4.0.1506) (2021-09-28) - - -### Bug Fixes - -* :bug: Fixed the issue where we were not generating the newsletter plex mediaserver link correctly ([b6064e9](https://github.com/Ombi-app/Ombi/commit/b6064e9308ee1218517f54d331c9bd7953ca631e)) -* **request-limits:** :bug: Fixed the issue where we were calculating Tv Request limit reset date incorrectly ([ceaec3f](https://github.com/Ombi-app/Ombi/commit/ceaec3feb0c9fbdab48595d7e425930a39d87ad5)) -* :bug: Fixed the issue where the user management login dates were not local time ([97be373](https://github.com/Ombi-app/Ombi/commit/97be3737700ed7b1ee915dbcd9f44103665d472c)), closes [#2925](https://github.com/Ombi-app/Ombi/issues/2925) - - -### Features - -* **request-limits:** :card_file_box: Added new user field migrations to mysql and sqlite ([f73bccb](https://github.com/Ombi-app/Ombi/commit/f73bccbea759fb4aeadc32f94b1ef6c9aecc5e94)) -* **request-limits:** :sparkles: Added in the main logic for the new request limits ([70d5bf5](https://github.com/Ombi-app/Ombi/commit/70d5bf52bff2e321fb1f3d00fd1cd1121a2717b7)) -* **request-limits:** :sparkles: Added the UI portion to set the new limits ([978d4ea](https://github.com/Ombi-app/Ombi/commit/978d4ea33b32d5a8333c75e29d4cd702e434c5f0)) -* **request-limits:** :sparkles: Request limits are no longer a rolling date. But reset at the start of the week or month depending on the preference ([364b9f1](https://github.com/Ombi-app/Ombi/commit/364b9f11afcd470cc2b112cf81cd840316ddc80e)) -* **request-limits:** :sparkles: Updated the RequestLimit Rules to use the new refactored service ([e31ee8d](https://github.com/Ombi-app/Ombi/commit/e31ee8d89213a8fc179db56cc51d3f02648b51ec)) -* **request-limits:** :tada: Started on the request limits, applied to the user model ([f5310b7](https://github.com/Ombi-app/Ombi/commit/f5310b786b43b3c00d392da977c2b3367a5e4e11)) - - - -## [4.0.1488](https://github.com/Ombi-app/Ombi/compare/v4.0.1487...v4.0.1488) (2021-09-18) - - -### Features - -* **discover:** :lipstick: Moved the advanced search to the nav bar for better discovery ([f83abaf](https://github.com/Ombi-app/Ombi/commit/f83abafdd9fc416c8ca4d99a52b5fc94e0b781fd)) - - -