From 82fdb9cff8dbab713700c8b92613542e080b3905 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 22:29:42 +0000 Subject: [PATCH 01/26] Updated release action to make it commit the latest changes to repo at the end --- .github/workflows/makeRelease.yml | 6 ++++++ .gitignore | 1 + library/c.lib_rev.h | 10 +++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 40e8ef21..a5890715 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -59,6 +59,12 @@ jobs: rm /opt/amigarepo/ubuntu/pool/main/clib4*.deb after_script: | /root/regenerate-packages.sh + - name: Commit latest changes to repository + run: | + git config --global user.email "walkero@gmail.com" + git config --global user.name "walkero-gr" + git commit -a -m "Release clib4-${{ github.event.release.tag_name }} changes" + git push # - name: Prepare OS4Depot release # run: | # mkdir os4depot-release diff --git a/.gitignore b/.gitignore index dc358ddb..203c012a 100755 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,6 @@ build/ clib4.lha .idea/ clib4_1.0_amd64 +clib4-*_amd64 *.deb clib4/ \ No newline at end of file diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index b81c4291..d3b5379a 100755 --- a/library/c.lib_rev.h +++ b/library/c.lib_rev.h @@ -1,8 +1,8 @@ #define VERSION 1 -#define REVISION 0 +#define REVISION 3 #define SUBREVISION 0 -#define DATE "28.05.2024" -#define VERS "clib4.library 1.0.0" -#define VSTRING "clib4.library 1.0.0 (28.05.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 1.0.0 (28.05.2024)" \ No newline at end of file +#define DATE "04.06.2024" +#define VERS "clib4.library 1.3.0" +#define VSTRING "clib4.library 1.3.0 (04.06.2024)\r\n" +#define VERSTAG "\0$VER: clib4.library 1.3.0 (04.06.2024)" \ No newline at end of file From cbb8a369498f81a55f5a032e638d1c5d35353439 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 22:34:05 +0000 Subject: [PATCH 02/26] Disabled temporarily the release to the ubuntu server --- .github/workflows/makeRelease.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index a5890715..71133737 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -46,19 +46,19 @@ jobs: asset_path: /opt/code/clib4-${{ github.event.release.tag_name }}_amd64.deb asset_name: clib4-${{ github.event.release.tag_name }}_amd64.deb asset_content_type: application/vnd.debian.binary-pac - - name: Upload DEB release file to the server - uses: kostya-ten/ssh-server-deploy@v4 - with: - host: ${{ secrets.DEBSERVER_HOST }} - port: ${{ secrets.DEBSERVER_PORT }} - username: ${{ secrets.DEBSERVER_USERNAME }} - private_key: ${{ secrets.DEBSERVER_PRIVATE_KEY }} - scp_source: clib4-${{ github.event.release.tag_name }}_amd64.deb - scp_target: /opt/amigarepo/ubuntu/pool/main - before_script: | - rm /opt/amigarepo/ubuntu/pool/main/clib4*.deb - after_script: | - /root/regenerate-packages.sh + # - name: Upload DEB release file to the server + # uses: kostya-ten/ssh-server-deploy@v4 + # with: + # host: ${{ secrets.DEBSERVER_HOST }} + # port: ${{ secrets.DEBSERVER_PORT }} + # username: ${{ secrets.DEBSERVER_USERNAME }} + # private_key: ${{ secrets.DEBSERVER_PRIVATE_KEY }} + # scp_source: clib4-${{ github.event.release.tag_name }}_amd64.deb + # scp_target: /opt/amigarepo/ubuntu/pool/main + # before_script: | + # rm /opt/amigarepo/ubuntu/pool/main/clib4*.deb + # after_script: | + # /root/regenerate-packages.sh - name: Commit latest changes to repository run: | git config --global user.email "walkero@gmail.com" From c451030b639e05364c01b45b10928a916f244f97 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 22:41:17 +0000 Subject: [PATCH 03/26] Fixing the "fatal: detected dubious ownership in repository" --- .github/workflows/makeRelease.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 71133737..6636fd61 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -61,6 +61,7 @@ jobs: # /root/regenerate-packages.sh - name: Commit latest changes to repository run: | + git config --global --add safe.directory /__w/clib4/clib4 git config --global user.email "walkero@gmail.com" git config --global user.name "walkero-gr" git commit -a -m "Release clib4-${{ github.event.release.tag_name }} changes" From dcf90a9766ecd937a8ff088e40c5877cc064c784 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 22:47:51 +0000 Subject: [PATCH 04/26] Fixing issues with commit --- .github/workflows/makeRelease.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 6636fd61..d385bdeb 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -61,7 +61,8 @@ jobs: # /root/regenerate-packages.sh - name: Commit latest changes to repository run: | - git config --global --add safe.directory /__w/clib4/clib4 + git status + git config --global --add safe.directory /opt/code git config --global user.email "walkero@gmail.com" git config --global user.name "walkero-gr" git commit -a -m "Release clib4-${{ github.event.release.tag_name }} changes" From 9cefcabea50b204027e2fd07e473c7be288f32dc Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 23:08:37 +0000 Subject: [PATCH 05/26] Changed the safe.directory config --- .github/workflows/makeRelease.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index d385bdeb..56c8dde8 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -17,6 +17,8 @@ jobs: steps: - name: Pull code uses: actions/checkout@v4 + - name: Add repository to git safe directories + run: git config --global --add safe.directory $GITHUB_WORKSPACE - name: Compile clib4 run: | cd /opt/code && \ @@ -61,11 +63,10 @@ jobs: # /root/regenerate-packages.sh - name: Commit latest changes to repository run: | - git status - git config --global --add safe.directory /opt/code git config --global user.email "walkero@gmail.com" git config --global user.name "walkero-gr" - git commit -a -m "Release clib4-${{ github.event.release.tag_name }} changes" + git add . + git commit -m "Release clib4-${{ github.event.release.tag_name }} changes" git push # - name: Prepare OS4Depot release # run: | From e8f04ee2764ec7fded067d9300da59d327b21a53 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 23:13:03 +0000 Subject: [PATCH 06/26] Changed the push command --- .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 56c8dde8..0bfbc549 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -67,7 +67,7 @@ jobs: git config --global user.name "walkero-gr" git add . git commit -m "Release clib4-${{ github.event.release.tag_name }} changes" - git push + git push origin HEAD:master # - name: Prepare OS4Depot release # run: | # mkdir os4depot-release From 3bbbfc6f2f609d15ff41d34ecf703581222d2670 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 23:22:43 +0000 Subject: [PATCH 07/26] git force push --- .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 0bfbc549..b56d61a9 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -67,7 +67,7 @@ jobs: git config --global user.name "walkero-gr" git add . git commit -m "Release clib4-${{ github.event.release.tag_name }} changes" - git push origin HEAD:master + git push origin HEAD:master --force # - name: Prepare OS4Depot release # run: | # mkdir os4depot-release From 6b0a03531860f0e190d98f37f5e610aa5397d511 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 23:36:05 +0000 Subject: [PATCH 08/26] Added creation of a PR --- .github/workflows/makeRelease.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index b56d61a9..8baf66d4 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -63,11 +63,13 @@ jobs: # /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" - git push origin HEAD:master --force + - name: Create Pull Request + uses: peter-evans/create-pull-request@v6 # - name: Prepare OS4Depot release # run: | # mkdir os4depot-release From fb4c61a3cc5631cff21c0b98c0bfe551aed07c33 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Fri, 16 Aug 2024 23:48:13 +0000 Subject: [PATCH 09/26] Changed the PR --- GNUmakefile.os4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GNUmakefile.os4 b/GNUmakefile.os4 index 1d64172f..4e2e3aa5 100644 --- a/GNUmakefile.os4 +++ b/GNUmakefile.os4 @@ -165,13 +165,15 @@ ifneq ($(origin GITTAG),undefined) MAJOR = $(patsubst v%,%,$(firstword $(subst ., ,$(GITTAG)))) MINOR = $(word 2, $(subst ., ,$(GITTAG))) PATCH = $(word 3, $(subst ., ,$(GITTAG))) +GIT_HASH = $(git rev-parse --short HEAD) endif ############################################################################## # This is the first target: it depends on all the targets -all: gitver prepare all-targets all-libs clib4.library.debug clib4.library +all: gitver prepare +# all-targets all-libs clib4.library.debug clib4.library ############################################################################## @@ -256,7 +258,7 @@ ifdef GITTAG $(VERBOSE)sed -i 's/VERSION\t*[[:digit:]]/VERSION\t\t\t$(MAJOR)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/REVISION\t*[[:digit:]]/REVISION\t\t$(MINOR)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/SUBREVISION\t*[[:digit:]]/SUBREVISION\t\t$(PATCH)/g' library/c.lib_rev.h - $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)/g' library/c.lib_rev.h + $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)-$(GIT_HASH)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/Version: [0-9]*\.[0-9]*\.[0-9]*/Version: $(MAJOR).$(MINOR).$(PATCH)/g' misc/control endif From 43e1dba15bcf35d08a073fa2e5f9b7d9f32cc70a Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 00:05:26 +0000 Subject: [PATCH 10/26] updated the PR again --- .github/workflows/makeRelease.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 8baf66d4..e5727ebb 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -61,15 +61,21 @@ 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: 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 + with: + commit-message: Release ${{ github.event.release.tag_name }} changes + branch: release/${{ github.event.release.tag_name }} + base: master + body: Automated changes as part of the release # - name: Prepare OS4Depot release # run: | # mkdir os4depot-release From 963ce8a771c01fd7bb701a2565c7729d725f4a29 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 00:21:56 +0000 Subject: [PATCH 11/26] Added short sommit hash in the VERSTAG --- GNUmakefile.os4 | 5 +++-- library/c.lib_rev.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GNUmakefile.os4 b/GNUmakefile.os4 index 4e2e3aa5..0005b451 100644 --- a/GNUmakefile.os4 +++ b/GNUmakefile.os4 @@ -165,7 +165,7 @@ ifneq ($(origin GITTAG),undefined) MAJOR = $(patsubst v%,%,$(firstword $(subst ., ,$(GITTAG)))) MINOR = $(word 2, $(subst ., ,$(GITTAG))) PATCH = $(word 3, $(subst ., ,$(GITTAG))) -GIT_HASH = $(git rev-parse --short HEAD) +GIT_HASH = $(shell git rev-parse --short HEAD) endif ############################################################################## @@ -258,7 +258,8 @@ ifdef GITTAG $(VERBOSE)sed -i 's/VERSION\t*[[:digit:]]/VERSION\t\t\t$(MAJOR)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/REVISION\t*[[:digit:]]/REVISION\t\t$(MINOR)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/SUBREVISION\t*[[:digit:]]/SUBREVISION\t\t$(PATCH)/g' library/c.lib_rev.h - $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)-$(GIT_HASH)/g' library/c.lib_rev.h + $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)/g' library/c.lib_rev.h + $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]-[a-z0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)-$(GIT_HASH)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/Version: [0-9]*\.[0-9]*\.[0-9]*/Version: $(MAJOR).$(MINOR).$(PATCH)/g' misc/control endif diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index d3b5379a..f2fa3f12 100755 --- a/library/c.lib_rev.h +++ b/library/c.lib_rev.h @@ -5,4 +5,4 @@ #define DATE "04.06.2024" #define VERS "clib4.library 1.3.0" #define VSTRING "clib4.library 1.3.0 (04.06.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 1.3.0 (04.06.2024)" \ No newline at end of file +#define VERSTAG "\0$VER: clib4.library 1.3.0-dummy (04.06.2024)" \ No newline at end of file From 28a68daa02efe10db2d6cf4c9aac1e1e2e45cf76 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 00:22:16 +0000 Subject: [PATCH 12/26] Trying Pull Request Automerge --- .github/workflows/makeRelease.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index e5727ebb..9ea7d6e6 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -76,6 +76,13 @@ jobs: branch: release/${{ github.event.release.tag_name }} base: master body: Automated changes as part of the release + - name: Enable Pull Request Automerge + 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 # run: | # mkdir os4depot-release From 6fd60377a48293e6ec19999af06bbb791029a843 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 00:34:14 +0000 Subject: [PATCH 13/26] Added a step to install gh binary --- .github/workflows/makeRelease.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 9ea7d6e6..bbd5e6b9 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -39,6 +39,12 @@ jobs: asset_path: /opt/code/clib4-${{ github.event.release.tag_name }}.lha asset_name: clib4-${{ github.event.release.tag_name }}.lha asset_content_type: application/x-lzh-compressed + - name: Install gh binary + run: | + apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0 && \ + apt-add-repository https://cli.github.com/packages && \ + apt update && \ + apt install gh - name: Upload DEB release file in GitHub uses: actions/upload-release-asset@v1 env: @@ -76,6 +82,7 @@ jobs: branch: release/${{ github.event.release.tag_name }} base: master body: Automated changes as part of the release + title: Version files changes by the github bot - name: Enable Pull Request Automerge if: steps.cpr.outputs.pull-request-operation == 'created' uses: peter-evans/enable-pull-request-automerge@v3 From aa70d05b5ce06713cddad308d0654a3e40a14c96 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 00:38:31 +0000 Subject: [PATCH 14/26] Updated the code to install gh binary --- .github/workflows/makeRelease.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index bbd5e6b9..e0b811c6 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -41,10 +41,12 @@ jobs: asset_content_type: application/x-lzh-compressed - name: Install gh binary run: | - apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0 && \ - apt-add-repository https://cli.github.com/packages && \ - apt update && \ - apt install gh + mkdir -p -m 755 /etc/apt/keyrings \ + && wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \ + && chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \ + && apt update \ + && apt install gh -y - name: Upload DEB release file in GitHub uses: actions/upload-release-asset@v1 env: From 6217c38f61989701904fa831187071a88a372ee0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 00:40:17 +0000 Subject: [PATCH 15/26] Release v2.1.12 changes (#11) Co-authored-by: walkero-gr <14014909+walkero-gr@users.noreply.github.com> --- library/c.lib_rev.h | 14 +++++++------- misc/control | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index f2fa3f12..09adb6f1 100755 --- a/library/c.lib_rev.h +++ b/library/c.lib_rev.h @@ -1,8 +1,8 @@ -#define VERSION 1 -#define REVISION 3 -#define SUBREVISION 0 +#define VERSION 2 +#define REVISION 1 +#define SUBREVISION 12 -#define DATE "04.06.2024" -#define VERS "clib4.library 1.3.0" -#define VSTRING "clib4.library 1.3.0 (04.06.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 1.3.0-dummy (04.06.2024)" \ No newline at end of file +#define DATE "17.08.2024" +#define VERS "clib4.library 2.1.12" +#define VSTRING "clib4.library 2.1.12 (17.08.2024)\r\n" +#define VERSTAG "\0$VER: clib4.library 2.1.12-dummy (17.08.2024)" \ No newline at end of file diff --git a/misc/control b/misc/control index a7574687..3324e5b3 100644 --- a/misc/control +++ b/misc/control @@ -1,5 +1,5 @@ Package: amigaos4-clib4 -Version: 1.0.2 +Version: 2.1.12 Maintainer: Andrea Palmatè Architecture: amd64 Section: libdevel From 683a44381d3bb6c972a54d6046e11bc7d1742874 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 00:46:00 +0000 Subject: [PATCH 16/26] A small fix in Makefile --- GNUmakefile.os4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNUmakefile.os4 b/GNUmakefile.os4 index 0005b451..5d10e9e1 100644 --- a/GNUmakefile.os4 +++ b/GNUmakefile.os4 @@ -259,7 +259,7 @@ ifdef GITTAG $(VERBOSE)sed -i 's/REVISION\t*[[:digit:]]/REVISION\t\t$(MINOR)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/SUBREVISION\t*[[:digit:]]/SUBREVISION\t\t$(PATCH)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)/g' library/c.lib_rev.h - $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]-[a-z0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)-$(GIT_HASH)/g' library/c.lib_rev.h + $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*-[a-z0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)-$(GIT_HASH)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/Version: [0-9]*\.[0-9]*\.[0-9]*/Version: $(MAJOR).$(MINOR).$(PATCH)/g' misc/control endif From 8796e09c03cbc80ab1bd8c585d627dc5337c9705 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 00:47:28 +0000 Subject: [PATCH 17/26] Release v2.1.13 changes (#12) 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 09adb6f1..87e8dd90 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 12 +#define SUBREVISION 132 #define DATE "17.08.2024" -#define VERS "clib4.library 2.1.12" -#define VSTRING "clib4.library 2.1.12 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.12-dummy (17.08.2024)" \ No newline at end of file +#define VERS "clib4.library 2.1.13" +#define VSTRING "clib4.library 2.1.13 (17.08.2024)\r\n" +#define VERSTAG "\0$VER: clib4.library 2.1.13- (17.08.2024)" \ No newline at end of file diff --git a/misc/control b/misc/control index 3324e5b3..a32b5b06 100644 --- a/misc/control +++ b/misc/control @@ -1,5 +1,5 @@ Package: amigaos4-clib4 -Version: 2.1.12 +Version: 2.1.13 Maintainer: Andrea Palmatè Architecture: amd64 Section: libdevel From 5b0091e4f273e31992891e6cd176221917983a8d Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 00:49:51 +0000 Subject: [PATCH 18/26] Added /opt/code to safe directories --- .github/workflows/makeRelease.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index e0b811c6..26912a37 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -18,7 +18,9 @@ jobs: - name: Pull code uses: actions/checkout@v4 - name: Add repository to git safe directories - run: git config --global --add safe.directory $GITHUB_WORKSPACE + run: | + git config --global --add safe.directory $GITHUB_WORKSPACE + git config --global --add safe.directory /opt/code - name: Compile clib4 run: | cd /opt/code && \ From 070822d078daef93b3ca0e0e05846cc8f55d3e64 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 00:51:51 +0000 Subject: [PATCH 19/26] Release v2.1.14 changes (#13) 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 87e8dd90..1bc70ec5 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 132 +#define SUBREVISION 1432 #define DATE "17.08.2024" -#define VERS "clib4.library 2.1.13" -#define VSTRING "clib4.library 2.1.13 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.13- (17.08.2024)" \ No newline at end of file +#define VERS "clib4.library 2.1.14" +#define VSTRING "clib4.library 2.1.14 (17.08.2024)\r\n" +#define VERSTAG "\0$VER: clib4.library 2.1.14-5b0091e (17.08.2024)" \ No newline at end of file diff --git a/misc/control b/misc/control index a32b5b06..5c5a2851 100644 --- a/misc/control +++ b/misc/control @@ -1,5 +1,5 @@ Package: amigaos4-clib4 -Version: 2.1.13 +Version: 2.1.14 Maintainer: Andrea Palmatè Architecture: amd64 Section: libdevel From d73715d352f8f162811ee2e62b8bb04d9dedcd84 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 00:54:30 +0000 Subject: [PATCH 20/26] Enabled compilation again --- GNUmakefile.os4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/GNUmakefile.os4 b/GNUmakefile.os4 index 5d10e9e1..8d3cbe48 100644 --- a/GNUmakefile.os4 +++ b/GNUmakefile.os4 @@ -172,8 +172,7 @@ endif # This is the first target: it depends on all the targets -all: gitver prepare -# all-targets all-libs clib4.library.debug clib4.library +all: gitver prepare all-targets all-libs clib4.library.debug clib4.library ############################################################################## From 6c68a9f022f1a71b00f7839ab061f67ed4aa7651 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 00:57:46 +0000 Subject: [PATCH 21/26] Release v2.1.17 changes (#14) 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 1bc70ec5..f4564b7f 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 1432 +#define SUBREVISION 17432 #define DATE "17.08.2024" -#define VERS "clib4.library 2.1.14" -#define VSTRING "clib4.library 2.1.14 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.14-5b0091e (17.08.2024)" \ No newline at end of file +#define VERS "clib4.library 2.1.17" +#define VSTRING "clib4.library 2.1.17 (17.08.2024)\r\n" +#define VERSTAG "\0$VER: clib4.library 2.1.17-d73715d (17.08.2024)" \ No newline at end of file diff --git a/misc/control b/misc/control index 5c5a2851..40033697 100644 --- a/misc/control +++ b/misc/control @@ -1,5 +1,5 @@ Package: amigaos4-clib4 -Version: 2.1.14 +Version: 2.1.17 Maintainer: Andrea Palmatè Architecture: amd64 Section: libdevel From acbb46ca76ae9b70182c03895b8ab1aeff26880a Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 01:03:52 +0000 Subject: [PATCH 22/26] Changed the digita to multinumbers --- GNUmakefile.os4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GNUmakefile.os4 b/GNUmakefile.os4 index 8d3cbe48..24a6307b 100644 --- a/GNUmakefile.os4 +++ b/GNUmakefile.os4 @@ -254,9 +254,9 @@ gitver: $(VERBOSE)sed -i 's/[(]\([0-9]*\.[0-9]*\.[0-9]*\)[)]/($(DATESTR))/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/"\([0-9]*\.[0-9]*\.[0-9]*\)"/"$(DATESTR)"/g' library/c.lib_rev.h ifdef GITTAG - $(VERBOSE)sed -i 's/VERSION\t*[[:digit:]]/VERSION\t\t\t$(MAJOR)/g' library/c.lib_rev.h - $(VERBOSE)sed -i 's/REVISION\t*[[:digit:]]/REVISION\t\t$(MINOR)/g' library/c.lib_rev.h - $(VERBOSE)sed -i 's/SUBREVISION\t*[[:digit:]]/SUBREVISION\t\t$(PATCH)/g' library/c.lib_rev.h + $(VERBOSE)sed -i 's/VERSION\t*[0-9]*/VERSION\t\t\t$(MAJOR)/g' library/c.lib_rev.h + $(VERBOSE)sed -i 's/REVISION\t*[0-9]*/REVISION\t\t$(MINOR)/g' library/c.lib_rev.h + $(VERBOSE)sed -i 's/SUBREVISION\t*[0-9]*/SUBREVISION\t\t$(PATCH)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*-[a-z0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)-$(GIT_HASH)/g' library/c.lib_rev.h $(VERBOSE)sed -i 's/Version: [0-9]*\.[0-9]*\.[0-9]*/Version: $(MAJOR).$(MINOR).$(PATCH)/g' misc/control From a485fdabc7c99d230283c302d597ce0c92f003ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 17 Aug 2024 01:06:57 +0000 Subject: [PATCH 23/26] Release v2.1.18 changes (#15) 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 f4564b7f..e46492dd 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 17432 +#define SUBREVISION 18 #define DATE "17.08.2024" -#define VERS "clib4.library 2.1.17" -#define VSTRING "clib4.library 2.1.17 (17.08.2024)\r\n" -#define VERSTAG "\0$VER: clib4.library 2.1.17-d73715d (17.08.2024)" \ No newline at end of file +#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 diff --git a/misc/control b/misc/control index 40033697..6dc00410 100644 --- a/misc/control +++ b/misc/control @@ -1,5 +1,5 @@ Package: amigaos4-clib4 -Version: 2.1.17 +Version: 2.1.18 Maintainer: Andrea Palmatè Architecture: amd64 Section: libdevel From 9585262201144d22de2b2642d9031dc3f40375a0 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 01:10:50 +0000 Subject: [PATCH 24/26] Fixed the versions --- library/c.lib_rev.h | 14 +++++++------- misc/control | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/c.lib_rev.h b/library/c.lib_rev.h index e46492dd..f2fa3f12 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 VERSION 1 +#define REVISION 3 +#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 DATE "04.06.2024" +#define VERS "clib4.library 1.3.0" +#define VSTRING "clib4.library 1.3.0 (04.06.2024)\r\n" +#define VERSTAG "\0$VER: clib4.library 1.3.0-dummy (04.06.2024)" \ No newline at end of file diff --git a/misc/control b/misc/control index 6dc00410..23b28426 100644 --- a/misc/control +++ b/misc/control @@ -1,5 +1,5 @@ Package: amigaos4-clib4 -Version: 2.1.18 +Version: 1.3.0 Maintainer: Andrea Palmatè Architecture: amd64 Section: libdevel From bad9c9469cb172630a743a3af39f133d004b31ad Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 01:12:36 +0000 Subject: [PATCH 25/26] Enabled again the upload of the DEB file to the ubuntu repo --- .github/workflows/makeRelease.yml | 34 ++++++++++++------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml index 26912a37..269f5159 100644 --- a/.github/workflows/makeRelease.yml +++ b/.github/workflows/makeRelease.yml @@ -58,26 +58,19 @@ jobs: asset_path: /opt/code/clib4-${{ github.event.release.tag_name }}_amd64.deb asset_name: clib4-${{ github.event.release.tag_name }}_amd64.deb asset_content_type: application/vnd.debian.binary-pac - # - name: Upload DEB release file to the server - # uses: kostya-ten/ssh-server-deploy@v4 - # with: - # host: ${{ secrets.DEBSERVER_HOST }} - # port: ${{ secrets.DEBSERVER_PORT }} - # username: ${{ secrets.DEBSERVER_USERNAME }} - # private_key: ${{ secrets.DEBSERVER_PRIVATE_KEY }} - # scp_source: clib4-${{ github.event.release.tag_name }}_amd64.deb - # scp_target: /opt/amigarepo/ubuntu/pool/main - # before_script: | - # 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: Upload DEB release file to the server + uses: kostya-ten/ssh-server-deploy@v4 + with: + host: ${{ secrets.DEBSERVER_HOST }} + port: ${{ secrets.DEBSERVER_PORT }} + username: ${{ secrets.DEBSERVER_USERNAME }} + private_key: ${{ secrets.DEBSERVER_PRIVATE_KEY }} + scp_source: clib4-${{ github.event.release.tag_name }}_amd64.deb + scp_target: /opt/amigarepo/ubuntu/pool/main + before_script: | + rm /opt/amigarepo/ubuntu/pool/main/clib4*.deb + after_script: | + /root/regenerate-packages.sh - 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 From f1fa673651938bdf3d4c3e74bdf4d198c5e8beb8 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sat, 17 Aug 2024 08:46:19 +0000 Subject: [PATCH 26/26] A few changes in gitignore --- .gitignore | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 203c012a..a73ddaed 100755 --- a/.gitignore +++ b/.gitignore @@ -4,15 +4,17 @@ !libs/libauto.a *.lha *.bak +*.deb +*.map + /library/compiler.log -clib4.info compiler.log -*.map -.vscode -build/ +clib4.info clib4.lha -.idea/ -clib4_1.0_amd64 clib4-*_amd64 -*.deb -clib4/ \ No newline at end of file + +build/ +clib4/ + +.idea +.vscode \ No newline at end of file