Minor changes before PR

AmigaLabs · Mar 16, 2024 · 6e479f5 · 6e479f5
1 parent 38f1fea
commit 6e479f5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/makeRelease.yml b/.github/workflows/makeRelease.yml
@@ -3,7 +3,6 @@ on:
   release:
     branches:
       - master
-      - add-version-while-compile
     types: 
       - published
 
@@ -47,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: Prepare OS4Depot release
       #   run: |
       #     mkdir os4depot-release

diff --git a/GNUmakefile.os4 b/GNUmakefile.os4
@@ -233,13 +233,13 @@ clean:
 ##############################################################################
 
 gitver:
-	sed -i 's/[(]\([0-9]*\.[0-9]*\.[0-9]*\)[)]/($(DATESTR))/g' library/c.lib_rev.h
-	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
+	$(VERBOSE)sed -i 's/"\([0-9]*\.[0-9]*\.[0-9]*\)"/"$(DATESTR)"/g' library/c.lib_rev.h
 ifdef GITTAG
-	sed -i 's/VERSION\t*[[:digit:]]/VERSION\t\t\t$(MAJOR)/g' library/c.lib_rev.h
-	sed -i 's/REVISION\t*[[:digit:]]/REVISION\t\t$(MINOR)/g' library/c.lib_rev.h
-	sed -i 's/SUBREVISION\t*[[:digit:]]/SUBREVISION\t\t$(PATCH)/g' library/c.lib_rev.h
-	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/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
 endif
 
 # Update the version numbers bound to the individual libraries