Set dicord announcements on PRs

.github/workflows/mergeMaster.yml → .github/workflows/mergeMainBranches.yml

@@ -1,8 +1,9 @@
-name: Merge into master build
+name: Merge into main branches
 on:
   pull_request:
     branches:
       - master
+      - development
     types:
       - closed
 
@@ -45,4 +46,18 @@ jobs:
           spe: "yes"
 
       - name: Create the release archive
-        run: make -f GNUmakefile.os4 release
+        run: make -f GNUmakefile.os4 release
+
+  announcements:
+    needs: [compile-ppc, compile-spe]
+    name: Notify on Discord on successful PR merge
+    runs-on: ubuntu-latest
+    steps:
+    - name: PR notification
+      uses: appleboy/discord-action@master
+      with:
+        webhook_id: ${{ secrets.DISCORD_ANNOUNCEMENTS_ID }}
+        webhook_token: ${{ secrets.DISCORD_ANNOUNCEMENTS_TOKEN }}
+        message: "clib4: New code merged into **${{ github.event.pull_request.base.ref }}**. Check it out at: ${{ github.event.pull_request.html_url }}. Compare it at: ${{ github.event.pull_request.base.repo.html_url }}/compare/${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }}"
+        username: "GitHub Actions"
+        avatar_url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png"

GNUmakefile.os4

@@ -254,9 +254,9 @@ clean:
 ##############################################################################
 
 gitver:
+ifdef GITTAG
 	$(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*[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
@@ -442,7 +442,7 @@ release:
 	-$(COPY) libs/libauto.a clib4/lib/
 	-$(COPY) $(OUTPUT_LIB)/* clib4/lib/
 	-$(COPY) $(LIB_ROOT)/library/include/* clib4/include/
-	lha -ao5i clib4.lha clib4 clib4.info
+	@lha -ao5i clib4.lha clib4 clib4.info
 	-$(DELETE) clib4
 	-$(DELETE) clib4.info