From f2611b157ac825769955e6d48ad78003b2632304 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 09:25:21 +0000 Subject: [PATCH 01/12] Added a step to push notification to discord --- .github/workflows/makeRelease.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 26912a37..7309dc7d 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -71,13 +71,6 @@ jobs: # rm /opt/amigarepo/ubuntu/pool/main/clib4*.deb # after_script: | # /root/regenerate-packages.sh - # - name: Commit latest changes to repository - # run: | - # git checkout -b "release-${{ github.event.release.tag_name }}" - # git config --global user.email "walkero@gmail.com" - # git config --global user.name "walkero-gr" - # git add . - # git commit -m "Release clib4-${{ github.event.release.tag_name }} changes" - name: Create Pull Request id: cpr uses: peter-evans/create-pull-request@v6 @@ -91,7 +84,6 @@ jobs: if: steps.cpr.outputs.pull-request-operation == 'created' uses: peter-evans/enable-pull-request-automerge@v3 with: - # token: ${{ secrets.PAT }} pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} merge-method: squash # - name: Prepare OS4Depot release @@ -110,3 +102,11 @@ jobs: # password: # server-dir: ./upload # local-dir: /opt/code/os4depot-release/ + - name: Notify on Discord on success + if: success() + uses: discord-actions/message@v2 + with: + webhook_url: ${{ secrets.DISCORD_ANNOUNCEMENTS_WEBHOOK }} + content: "New release of clib4: ${{ github.event.release.tag_name }}" + username: "Github" + avatar: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png From 0d05d6d1e28ef1472f19335efffd648140a50ae2 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 09:26:39 +0000 Subject: [PATCH 02/12] A small fix in the action --- .github/workflows/makeRelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 7309dc7d..e5cf4bed 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -109,4 +109,4 @@ jobs: webhook_url: ${{ secrets.DISCORD_ANNOUNCEMENTS_WEBHOOK }} content: "New release of clib4: ${{ github.event.release.tag_name }}" username: "Github" - avatar: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png + avatar: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" From 22ce5377c1298d63dbe8f2d453edd115bb513b59 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 09:29:38 +0000 Subject: [PATCH 03/12] Release v2.1.0 changes (#16) Co-authored-by: walkero-gr <14014909+walkero-gr@users.noreply.github.com> --- library/c.lib_rev.h | 8 ++++---- misc/control | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index e46492dd..c29b39af 100755 --- a/library/c.lib_rev.h +++ b/library/c.lib_rev.h @@ -1,8 +1,8 @@ #define VERSION 2 #define REVISION 1 -#define SUBREVISION 18 +#define SUBREVISION 0 #define DATE "17.08.2024" -#define VERS "clib4.library 2.1.18" -#define VSTRING "clib4.library 2.1.18 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.18-acbb46c (17.08.2024)" \ No newline at end of file +#define VERS "clib4.library 2.1.0" +#define VSTRING "clib4.library 2.1.0 (17.08.2024)\r\n" +#define VERSTAG "\0$VER: clib4.library 2.1.0-0d05d6d (17.08.2024)" \ No newline at end of file diff --git a/misc/control b/misc/control index 6dc00410..8a65eed1 100644 --- a/misc/control +++ b/misc/control @@ -1,5 +1,5 @@ Package: amigaos4-clib4 -Version: 2.1.18 +Version: 2.1.0 Maintainer: Andrea Palmatè Architecture: amd64 Section: libdevel From 813b37ad886f6ff371b4521a43de4690dae47f9a Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 09:33:56 +0000 Subject: [PATCH 04/12] More fixes --- .github/workflows/makeRelease.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index e5cf4bed..b0f5868c 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -106,7 +106,7 @@ jobs: if: success() uses: discord-actions/message@v2 with: - webhook_url: ${{ secrets.DISCORD_ANNOUNCEMENTS_WEBHOOK }} - content: "New release of clib4: ${{ github.event.release.tag_name }}" + webhookUrl: ${{ secrets.DISCORD_ANNOUNCEMENTS_WEBHOOK }} + message: "New release of clib4: ${{ github.event.release.tag_name }}" username: "Github" avatar: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" From 02dc2b23ae047b1367bc8e7977ca1f79592011c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 09:37:06 +0000 Subject: [PATCH 05/12] Release v2.1.0 changes (#17) Co-authored-by: walkero-gr <14014909+walkero-gr@users.noreply.github.com> --- library/c.lib_rev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index c29b39af..4a48c1cb 100755 --- a/library/c.lib_rev.h +++ b/library/c.lib_rev.h @@ -5,4 +5,4 @@ #define DATE "17.08.2024" #define VERS "clib4.library 2.1.0" #define VSTRING "clib4.library 2.1.0 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.0-0d05d6d (17.08.2024)" \ No newline at end of file +#define VERSTAG "\0$VER: clib4.library 2.1.0-813b37a (17.08.2024)" \ No newline at end of file From a76a1c57dd424c69da9af56d88cb5b1c96b850fa Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 09:38:47 +0000 Subject: [PATCH 06/12] Changed the github action on discord announcement --- .github/workflows/makeRelease.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index b0f5868c..414a139b 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -102,11 +102,10 @@ jobs: # password: # server-dir: ./upload # local-dir: /opt/code/os4depot-release/ - - name: Notify on Discord on success - if: success() - uses: discord-actions/message@v2 + - name: Notify on Discord on successful release + uses: Ilshidur/action-discord@v2.1.0 with: - webhookUrl: ${{ secrets.DISCORD_ANNOUNCEMENTS_WEBHOOK }} - message: "New release of clib4: ${{ github.event.release.tag_name }}" - username: "Github" - avatar: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" + webhook_url: ${{ secrets.DISCORD_ANNOUNCEMENTS_WEBHOOK }} + content: "New release of clib4: ${{ github.event.release.tag_name }} has been created." + username: GitHub Actions + avatar_url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" From 89e36b298d2177439131bbcb4b714aa3d844b25b Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 09:45:40 +0000 Subject: [PATCH 07/12] Changed the action version --- .github/workflows/makeRelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 414a139b..0bb0beaa 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -103,7 +103,7 @@ jobs: # server-dir: ./upload # local-dir: /opt/code/os4depot-release/ - name: Notify on Discord on successful release - uses: Ilshidur/action-discord@v2.1.0 + uses: Ilshidur/action-discord@0.3.2 with: webhook_url: ${{ secrets.DISCORD_ANNOUNCEMENTS_WEBHOOK }} content: "New release of clib4: ${{ github.event.release.tag_name }} has been created." From a3bdb373897e17f254127f24aa55afbc79d3a9ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 09:49:28 +0000 Subject: [PATCH 08/12] Release v2.1.0 changes (#18) Co-authored-by: walkero-gr <14014909+walkero-gr@users.noreply.github.com> --- library/c.lib_rev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index 4a48c1cb..7bd56c9f 100755 --- a/library/c.lib_rev.h +++ b/library/c.lib_rev.h @@ -5,4 +5,4 @@ #define DATE "17.08.2024" #define VERS "clib4.library 2.1.0" #define VSTRING "clib4.library 2.1.0 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.0-813b37a (17.08.2024)" \ No newline at end of file +#define VERSTAG "\0$VER: clib4.library 2.1.0-89e36b2 (17.08.2024)" \ No newline at end of file From e8b68b8a01afffebeab3be24600924a3e92f8ce3 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 09:52:39 +0000 Subject: [PATCH 09/12] Changed the action again --- .github/workflows/makeRelease.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 0bb0beaa..0d5305a3 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -103,9 +103,10 @@ jobs: # server-dir: ./upload # local-dir: /opt/code/os4depot-release/ - name: Notify on Discord on successful release - uses: Ilshidur/action-discord@0.3.2 + uses: appleboy/discord-action@master with: - webhook_url: ${{ secrets.DISCORD_ANNOUNCEMENTS_WEBHOOK }} - content: "New release of clib4: ${{ github.event.release.tag_name }} has been created." + webhook_id: ${{ secrets.DISCORD_ANNOUNCEMENTS_ID }} + webhook_token: ${{ secrets.DISCORD_ANNOUNCEMENTS_TOKEN }} + message: "New release of clib4: ${{ github.event.release.tag_name }} has been created." username: GitHub Actions - avatar_url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" + avatar_url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" \ No newline at end of file From afad43a54b643e0d4415c63441a224cca6db7fb8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 09:55:18 +0000 Subject: [PATCH 10/12] Release v2.1.0 changes (#19) Co-authored-by: walkero-gr <14014909+walkero-gr@users.noreply.github.com> --- library/c.lib_rev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index 7bd56c9f..b9ec8211 100755 --- a/library/c.lib_rev.h +++ b/library/c.lib_rev.h @@ -5,4 +5,4 @@ #define DATE "17.08.2024" #define VERS "clib4.library 2.1.0" #define VSTRING "clib4.library 2.1.0 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.0-89e36b2 (17.08.2024)" \ No newline at end of file +#define VERSTAG "\0$VER: clib4.library 2.1.0-e8b68b8 (17.08.2024)" \ No newline at end of file From 724647f2f17d6523d23e73101b6daa7fd992cc88 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 10:02:17 +0000 Subject: [PATCH 11/12] Added the release url in discord message --- .github/workflows/makeRelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 0d5305a3..e7b6a941 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -107,6 +107,6 @@ jobs: with: webhook_id: ${{ secrets.DISCORD_ANNOUNCEMENTS_ID }} webhook_token: ${{ secrets.DISCORD_ANNOUNCEMENTS_TOKEN }} - message: "New release of clib4: ${{ github.event.release.tag_name }} has been created." + message: "New release of clib4: **${{ github.event.release.tag_name }}** has been created. Check it out at: https://github.com/walkero-gr/clib4/releases/tag/${{ github.event.release.tag_name }}" username: GitHub Actions avatar_url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" \ No newline at end of file From 05261f95edb96440d7be7258689e9baa2e0834db Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 10:05:26 +0000 Subject: [PATCH 12/12] Release v2.2.0 changes (#20) Co-authored-by: walkero-gr <14014909+walkero-gr@users.noreply.github.com> --- library/c.lib_rev.h | 8 ++++---- misc/control | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index b9ec8211..4345f905 100755 --- a/library/c.lib_rev.h +++ b/library/c.lib_rev.h @@ -1,8 +1,8 @@ #define VERSION 2 -#define REVISION 1 +#define REVISION 2 #define SUBREVISION 0 #define DATE "17.08.2024" -#define VERS "clib4.library 2.1.0" -#define VSTRING "clib4.library 2.1.0 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.0-e8b68b8 (17.08.2024)" \ No newline at end of file +#define VERS "clib4.library 2.2.0" +#define VSTRING "clib4.library 2.2.0 (17.08.2024)\r\n" +#define VERSTAG "\0$VER: clib4.library 2.2.0-724647f (17.08.2024)" \ No newline at end of file diff --git a/misc/control b/misc/control index 8a65eed1..108208f0 100644 --- a/misc/control +++ b/misc/control @@ -1,5 +1,5 @@ Package: amigaos4-clib4 -Version: 2.1.0 +Version: 2.2.0 Maintainer: Andrea Palmatè Architecture: amd64 Section: libdevel