From e8b036ac591fad56d2f14cc1d0cb836dcc64aa59 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sun, 24 Mar 2024 11:58:46 +0000 Subject: [PATCH 1/6] version 0.5.0 --- boot/version | 2 +- electron/package-lock.json | 4 ++-- electron/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/version b/boot/version index 1d0ba9ea..8f0916f7 100644 --- a/boot/version +++ b/boot/version @@ -1 +1 @@ -0.4.0 +0.5.0 diff --git a/electron/package-lock.json b/electron/package-lock.json index a89427e9..fb86be1a 100644 --- a/electron/package-lock.json +++ b/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "tp2intervals", - "version": "0.4.0", + "version": "0.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tp2intervals", - "version": "0.4.0", + "version": "0.5.0", "license": "GNU GPLv3", "dependencies": { "electron-log": "^5.1.1", diff --git a/electron/package.json b/electron/package.json index 2806b8ba..507b9189 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,7 +1,7 @@ { "name": "tp2intervals", "productName": "tp2intervals", - "version": "0.4.0", + "version": "0.5.0", "description": "Third Party synchronization with Intervals.icu", "keywords": [ "trainingpeaks", From 20227cfb00203502f9d91bd4e0242c7245cc9aa0 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sun, 24 Mar 2024 13:04:03 +0100 Subject: [PATCH 2/6] fix release action --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8e1224a5..8ae9e04b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,15 @@ jobs: dry-run: false electron: + strategy: + matrix: + environment: + - os: ubuntu-latest + - os: macos-latest + - os: windows-latest + uses: ./.github/workflows/build-electron.yml secrets: inherit with: + os: ${{ matrix.environment.os }} dry-run: false From 5acb60a1f06a1d5857e298bf02b9861950ad57c7 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sun, 24 Mar 2024 13:20:46 +0100 Subject: [PATCH 3/6] fix release action --- .github/workflows/release.yml | 2 ++ README.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ae9e04b..01a2cd7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,6 +26,8 @@ jobs: dry-run: false electron: + needs: + - jar strategy: matrix: environment: diff --git a/README.md b/README.md index a445e6a4..f0638430 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build main branch](https://github.com/freekode/tp2intervals/actions/workflows/main-branch.yml/badge.svg)](https://github.com/freekode/tp2intervals/actions/workflows/main-branch.yml) +[![Build branches](https://github.com/freekode/tp2intervals/actions/workflows/branch.yml/badge.svg)](https://github.com/freekode/tp2intervals/actions/workflows/branch.yml) [![release](https://img.shields.io/github/release/freekode/tp2intervals)](https://github.com/freekode/tp2intervals/releases/latest) # Third Party to Intervals.icu From 154316afe08285770d40483de835044b378f0890 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sun, 24 Mar 2024 13:22:09 +0100 Subject: [PATCH 4/6] revert release order --- .github/workflows/release.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01a2cd7d..dc10ca15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,23 @@ on: workflow_dispatch: jobs: + electron: + strategy: + matrix: + environment: + - os: ubuntu-latest + - os: macos-latest + - os: windows-latest + + uses: ./.github/workflows/build-electron.yml + secrets: inherit + with: + os: ${{ matrix.environment.os }} + dry-run: false + jar: + needs: + - electron uses: ./.github/workflows/build-jar.yml secrets: inherit with: @@ -24,19 +40,3 @@ jobs: jar-artifact-name: tp2intervals-jar image-name: tp2intervals dry-run: false - - electron: - needs: - - jar - strategy: - matrix: - environment: - - os: ubuntu-latest - - os: macos-latest - - os: windows-latest - - uses: ./.github/workflows/build-electron.yml - secrets: inherit - with: - os: ${{ matrix.environment.os }} - dry-run: false From e78187ce749b5bc7b07bb7d959029c4123b12c2f Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sun, 24 Mar 2024 13:34:02 +0100 Subject: [PATCH 5/6] revert release order --- .github/workflows/release.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc10ca15..01a2cd7d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,23 +6,7 @@ on: workflow_dispatch: jobs: - electron: - strategy: - matrix: - environment: - - os: ubuntu-latest - - os: macos-latest - - os: windows-latest - - uses: ./.github/workflows/build-electron.yml - secrets: inherit - with: - os: ${{ matrix.environment.os }} - dry-run: false - jar: - needs: - - electron uses: ./.github/workflows/build-jar.yml secrets: inherit with: @@ -40,3 +24,19 @@ jobs: jar-artifact-name: tp2intervals-jar image-name: tp2intervals dry-run: false + + electron: + needs: + - jar + strategy: + matrix: + environment: + - os: ubuntu-latest + - os: macos-latest + - os: windows-latest + + uses: ./.github/workflows/build-electron.yml + secrets: inherit + with: + os: ${{ matrix.environment.os }} + dry-run: false From 01d23567d9f332466ab83b883f4cd1f2fc1f8ecf Mon Sep 17 00:00:00 2001 From: Evgeny Date: Mon, 25 Mar 2024 10:38:11 +0100 Subject: [PATCH 6/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f0638430..63399c7f 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ # Third Party to Intervals.icu App to sync workouts between TrainingPeaks, TrainerRoad and Intervals.icu. -**TrainingPeaks related features:** +### TrainingPeaks features * Sync planned workouts from Intervals to TrainingPeaks for today and tomorrow (free TP account) * Copy whole training plan from TrainingPeaks * Copy planned workouts for date range from TrainingPeaks to Intervals.icu training plan or workout folder -**TrainerRoad related features:** +### TrainerRoad features * Copy workouts from TrainerRoad library to Intervals * Copy planned workouts for date range from TrainerRoad to Intervals.icu training plan or workout folder