Keep provenance

.github/workflows/build-rpm-arm64.yml

@@ -1,9 +1,8 @@
 name: RPM/DEB build aarch64
 
 on:
-  push:
+  release:
-    paths:
+    types: [published]
-      - 'RELEASE'
   workflow_dispatch:
 
 jobs:
@@ -45,11 +44,17 @@ jobs:
        rpmbuild -ba 3proxy-$RELEASE.spec
        cd $ret
        mv ~/rpmbuild/RPMS/aarch64/3proxy-$RELEASE-1.aarch64.rpm 3proxy-$RELEASE.arm64.rpm
-    - name: Get artifact arp
+    - name: Get artifact rpm
       uses: actions/upload-artifact@v6
       with:
        name: "3proxy-${{ env.RELEASE }}-arm64.rpm"
        path: "*.rpm"
+    - name: Upload rpm to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}.arm64.rpm
     - name: debbuild
       run: |
         ret=`pwd`
@@ -70,3 +75,9 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-arm64.deb"
        path: "*.deb"
+    - name: Upload deb to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}.arm64.deb

.github/workflows/build-rpm-armhf.yml

@@ -1,9 +1,8 @@
 name: RPM/DEB build armhf
 
 on:
-  push:
+  release:
-    paths:
+    types: [published]
-      - 'RELEASE'
   workflow_dispatch:
 
 jobs:
@@ -72,11 +71,17 @@ jobs:
        rpmbuild -ba --define "PAMLIB pam0g" --define "_arch arm" --define "cross yes" --target=arm-linux-gnueabi 3proxy-$RELEASE.spec
        cd $ret
        mv ~/rpmbuild/RPMS/arm/3proxy-$RELEASE-1.arm.rpm 3proxy-$RELEASE.arm.rpm
-    - name: Get artifact
+    - name: Get artifact rpm
       uses: actions/upload-artifact@v6
       with:
        name: "3proxy-${{ env.RELEASE }}-arm.rpm"
        path: "*.rpm"
+    - name: Upload rpm to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}.arm.rpm
     - name: debbuild
       run: |
         ret=`pwd`
@@ -103,3 +108,9 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-arm.deb"
        path: "*.deb"
+    - name: Upload deb to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}.arm.deb

.github/workflows/build-rpm-x86-64.yml

@@ -1,9 +1,8 @@
 name: RPM/DEB build x86-64
 
 on:
-  push:
+  release:
-    paths:
+    types: [published]
-      - 'RELEASE'
   workflow_dispatch:
 
 jobs:
@@ -50,6 +49,12 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-x86_64.rpm"
        path: "*.rpm"
+    - name: Upload rpm to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}.x86_64.rpm
     - name: debbuild
       run: |
         ret=`pwd`
@@ -70,4 +75,10 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-x86_64.deb"
        path: "*.deb"
+    - name: Upload deb to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}.x86_64.deb
 

.github/workflows/build-watcom.yml

@@ -1,9 +1,8 @@
 name: Build Win32 3proxy-lite with Watcom
 
 on:
-  push:
+  release:
-    paths:
+    types: [published]
-      - 'RELEASE'
   workflow_dispatch:
 
 jobs:
@@ -80,3 +79,13 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-lite"
        path: dist/
+    - name: Create zip
+      if: github.event_name == 'release'
+      shell: pwsh
+      run: Compress-Archive -Path dist/* -DestinationPath 3proxy-${{ env.RELEASE }}-lite.zip
+    - name: Upload to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}-lite.zip

.github/workflows/build-win32.yml

@@ -1,9 +1,8 @@
 name: Build Win32 3proxy with MSVC
 
 on:
-  push:
+  release:
-    paths:
+    types: [published]
-      - 'RELEASE'
   workflow_dispatch:
 
 jobs:
@@ -86,3 +85,13 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}"
        path: dist/
+    - name: Create zip
+      if: github.event_name == 'release'
+      shell: pwsh
+      run: Compress-Archive -Path dist/* -DestinationPath 3proxy-${{ env.RELEASE }}-x86.zip
+    - name: Upload to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}-x86.zip

.github/workflows/build-win64.yml

@@ -1,9 +1,8 @@
 name: Build Win64 3proxy with MSVC
 
 on:
-  push:
+  release:
-    paths:
+    types: [published]
-      - 'RELEASE'
   workflow_dispatch:
 
 jobs:
@@ -87,3 +86,13 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-x64"
        path: dist/
+    - name: Create zip
+      if: github.event_name == 'release'
+      shell: pwsh
+      run: Compress-Archive -Path dist/* -DestinationPath 3proxy-${{ env.RELEASE }}-x64.zip
+    - name: Upload to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}-x64.zip

.github/workflows/build-winarm64.yml

@@ -1,9 +1,8 @@
 name: Build Win-arm64 3proxy with MSVC
 
 on:
-  push:
+  release:
-    paths:
+    types: [published]
-      - 'RELEASE'
   workflow_dispatch:
 
 jobs:
@@ -86,3 +85,13 @@ jobs:
       with:
        name: "3proxy-${{ env.RELEASE }}-arm64"
        path: dist/
+    - name: Create zip
+      if: github.event_name == 'release'
+      shell: pwsh
+      run: Compress-Archive -Path dist/* -DestinationPath 3proxy-${{ env.RELEASE }}-arm64.zip
+    - name: Upload to release
+      if: github.event_name == 'release'
+      env:
+       GH_TOKEN: ${{ github.token }}
+       TAG: ${{ github.event.release.tag_name }}
+      run: gh release upload "$TAG" 3proxy-${{ env.RELEASE }}-arm64.zip

.github/workflows/c-cpp-Linux.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches: [ "master" ]
     paths: [ '**.c', '**.h', 'Makefile.Linux', '.github/configs', '.github/workflows/c-cpp-Linux.yml' ]
-  pull_request:
-    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.Linux', '.github/configs', '.github/workflows/c-cpp-Linux.yml' ]
   workflow_dispatch:
 
 jobs:

.github/workflows/c-cpp-MacOS.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches: [ "master" ]
     paths: [ '**.c', '**.h', 'Makefile.FreeBSD', '.github/configs', '.github/workflows/c-cpp-MacOS.yml' ]
-  pull_request:
-    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.FreeBSD', '.github/configs', '.github/workflows/c-cpp-MacOS.yml' ]
   workflow_dispatch:
 
 jobs:

.github/workflows/c-cpp-Windows.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches: [ "master" ]
     paths: [ '**.c', '**.h', 'Makefile.msvc', '.github/configs', '.github/workflows/c-cpp-Windows.yml' ]
-  pull_request:
-    branches: [ "master" ]
-    paths: [ '**.c', '**.h', 'Makefile.msvc', '.github/configs', '.github/workflows/c-cpp-Windows.yml' ]
   workflow_dispatch:
 
 jobs:

.github/workflows/c-cpp-cmake.yml

@@ -4,9 +4,6 @@ on:
   push:
     branches: [ "master", "unix_socket" ]
     paths: [ '**.c', '**.h', '**.cmake', 'CMakeLists.txt', '.github/configs', '.github/workflows/c-cpp-cmake.yml' ]
-  pull_request:
-    branches: [ "master" ]
-    paths: [ '**.c', '**.h', '**.cmake', 'CMakeLists.txt', '.github/configs', '.github/workflows/c-cpp-cmake.yml' ]
   workflow_dispatch:
 
 jobs:

.github/workflows/docker-ghcr.yml

@@ -1,10 +1,8 @@
 name: Build Docker images (GHCR)
 
 on:
-  push:
+  release:
-    branches: [master]
+    types: [published]
-    paths:
-      - 'RELEASE'
   workflow_dispatch:
 
 env:
@@ -25,29 +23,31 @@ jobs:
       - name: Determine tags
         id: tags
         env:
-          REF: ${{ github.ref }}
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
           IMAGE: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
         run: |
-          if [[ "$REF" == refs/tags/* ]]; then
+          if [[ "$RELEASE_TAG" != "" ]]; then
-            RELEASE=$(cat RELEASE)
+            RELEASE="${RELEASE_TAG#v}"
             echo "minimal=${IMAGE}:${RELEASE}.minimal,${IMAGE}:minimal" >> "$GITHUB_OUTPUT"
             echo "busybox=${IMAGE}:${RELEASE}.busybox,${IMAGE}:busybox" >> "$GITHUB_OUTPUT"
             echo "full=${IMAGE}:${RELEASE},${IMAGE}:latest" >> "$GITHUB_OUTPUT"
           else
-            echo "minimal=${IMAGE}:devel.minimal" >> "$GITHUB_OUTPUT"
+            DATETIME=$(date +%d%m%y%H%M%S)
-            echo "busybox=${IMAGE}:devel.busybox" >> "$GITHUB_OUTPUT"
+            BRANCH=$(echo "${GITHUB_REF#refs/heads/}" | tr "/" "-")
-            echo "full=${IMAGE}:devel" >> "$GITHUB_OUTPUT"
+            echo "minimal=${IMAGE}:${DATETIME}-${BRANCH}.minimal,${IMAGE}:${BRANCH}.minimal" >> "$GITHUB_OUTPUT"
+            echo "busybox=${IMAGE}:${DATETIME}-${BRANCH}.busybox,${IMAGE}:${BRANCH}.busybox" >> "$GITHUB_OUTPUT"
+            echo "full=${IMAGE}:${DATETIME}-${BRANCH},${IMAGE}:${BRANCH}" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to GHCR
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -79,3 +79,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.tags.outputs.full }}
+

.github/workflows/docker.yml

@@ -1,10 +1,8 @@
 name: Build Docker images (Docker Hub)
 
 on:
-  push:
+  release:
-    branches: [master]
+    types: [published]
-    paths:
-      - 'RELEASE'
   workflow_dispatch:
 
 env:
@@ -24,28 +22,30 @@ jobs:
       - name: Determine tags
         id: tags
         env:
-          REF: ${{ github.ref }}
+          RELEASE_TAG: ${{ github.event.release.tag_name }}
         run: |
-          if [[ "$REF" == refs/tags/* ]]; then
+          if [[ "$RELEASE_TAG" != "" ]]; then
-            RELEASE=$(cat RELEASE)
+            RELEASE="${RELEASE_TAG#v}"
             echo "minimal=${REGISTRY}/${IMAGE_NAME}:${RELEASE}.minimal,${REGISTRY}/${IMAGE_NAME}:minimal" >> "$GITHUB_OUTPUT"
             echo "busybox=${REGISTRY}/${IMAGE_NAME}:${RELEASE}.busybox,${REGISTRY}/${IMAGE_NAME}:busybox" >> "$GITHUB_OUTPUT"
             echo "full=${REGISTRY}/${IMAGE_NAME}:${RELEASE},${REGISTRY}/${IMAGE_NAME}:latest" >> "$GITHUB_OUTPUT"
           else
-            echo "minimal=${REGISTRY}/${IMAGE_NAME}:devel.minimal" >> "$GITHUB_OUTPUT"
+            DATETIME=$(date +%d%m%y%H%M%S)
-            echo "busybox=${REGISTRY}/${IMAGE_NAME}:devel.busybox" >> "$GITHUB_OUTPUT"
+            BRANCH=$(echo "${GITHUB_REF#refs/heads/}" | tr "/" "-")
-            echo "full=${REGISTRY}/${IMAGE_NAME}:devel" >> "$GITHUB_OUTPUT"
+            echo "minimal=${REGISTRY}/${IMAGE_NAME}:${DATETIME}-${BRANCH}.minimal,${REGISTRY}/${IMAGE_NAME}:${BRANCH}.minimal" >> "$GITHUB_OUTPUT"
+            echo "busybox=${REGISTRY}/${IMAGE_NAME}:${DATETIME}-${BRANCH}.busybox,${REGISTRY}/${IMAGE_NAME}:${BRANCH}.busybox" >> "$GITHUB_OUTPUT"
+            echo "full=${REGISTRY}/${IMAGE_NAME}:${DATETIME}-${BRANCH},${REGISTRY}/${IMAGE_NAME}:${BRANCH}" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

Dockerfile.busybox

@@ -44,8 +44,7 @@ RUN cd /dist &&\
  ln -s /lib usr/lib64
 RUN cp /lib/ld-*.so.* /dist/usr/local/3proxy/libexec || true
 RUN cp /lib64/ld-*.so.* /dist/usr/local/3proxy/libexec || true
-RUN cp "/lib/`gcc -dumpmachine`"/libdl.so.* /dist/usr/local/3proxy/libexec &&\
+RUN cp "/lib/`gcc -dumpmachine`"/libdl.so.* /dist/usr/local/3proxy/libexec
- ls -lR /dist
 
 FROM docker.io/busybox:glibc
 COPY --from=buildenv /dist /

Dockerfile.full

@@ -54,8 +54,7 @@ RUN cd /dist/usr/local/3proxy/ &&\
 RUN cd /dist/usr/local/3proxy/usr &&\
  ln -s ../libexec lib &&\
  ln -s ../libexec lib64 &&\
- strip /dist/usr/local/3proxy/libexec/*.so &&\
+ strip /dist/usr/local/3proxy/libexec/*.so
- ls -lR /dist
 
 FROM scratch
 COPY --from=buildenv /dist /