fix: Fixing CI. Set (package) repo name variable 👷🔥️

.github/workflows/build.yml

@@ -4,29 +4,13 @@ on:
     branches:
       - "**"
     tags:
-      - " !**"
+      - "!**"
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
      - uses: actions/checkout@v4
-     - uses: actions/setup-go@v5
-       with:
-         go-version: '1.22'
-#     - name: Install gitea provider for Go Semantic Release
-#       run: |
-#         mkdir -p .semrel/$(go env GOOS)_$(go env GOARCH)/provider-gitea/${GITEA_PROVIDER_VER}/ && \
-#         wget https://github.com/cybercinch/go-semantic-release-provider-gitea/releases/download/v${GITEA_PROVIDER_VER}/go-semantic-release-provider-gitea_v${GITEA_PROVIDER_VER}_linux_amd64 \
-#         -O .semrel/$(go env GOOS)_$(go env GOARCH)/provider-gitea/${GITEA_PROVIDER_VER}/gitea && \
-#         chmod a+x .semrel/$(go env GOOS)_$(go env GOARCH)/provider-gitea/${GITEA_PROVIDER_VER}/gitea
-#       env:
-#         GITEA_PROVIDER_VER: 1.0.11
-#     - uses: "shivammathur/setup-php@v2"
-#       with:
-#         php-version: "7.4"
-#     - uses: "ramsey/composer-install@v3"
-
      - name: Create Release Archive
        id: semrelease
        uses: go-semantic-release/action@v1
@@ -36,6 +20,4 @@ jobs:
        env:
           GITEA_TOKEN: ${{ secrets.G_TOKEN }}
           GITEA_HOST: ${{ secrets.G_SERVER_URL}}
-    env:
+
-      GITEA_TOKEN: ${{ secrets.G_TOKEN }}
-      GITEA_HOST: ${{ secrets.G_SERVER_URL}}

.github/workflows/dist.yml

@@ -0,0 +1,27 @@
+name: Create Distribution
+run-name: Distribute composer package with Gitea Actions 🚀
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  dist:
+    name: Create Archive
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4  # Checkout Sourcecode
+      - uses: https://hub.cybercinch.nz/cybercinch/composer-build-action@v1
+      - run: |
+          ls -lah
+          ls -lah build/
+      - uses: https://hub.cybercinch.nz/guisea/gitea-composer-upload-action@master
+        with:
+          baseurl: "${{ secrets.G_SERVER_URL}}"
+          access_token: "${{ secrets.G_TOKEN }}"
+          username: "${{ secrets.G_USERNAME }}"
+          owner: "cybercinch"  # Override owner name for repository (Optional) Only if different from username
+          repo_name: ugly-queue
+          version: "${{ env.GITHUB_REF_NAME }}"
+          overwrite_files: "true"
+

.semrelrc

@@ -14,7 +14,6 @@
         "exec"
       ],
       "options": {
-        "exec_on_success": "./scripts/build.sh v{{.NewRelease.Version}}",
         "exec_on_no_release": "echo {{.Reason}}: {{.Message}}"
       }
     }

composer.json

@@ -9,7 +9,7 @@
         "file queue",
         "ugly queue"
     ],
-    "homepage": "https://github.com/dcarbone/ugly-queue",
+    "homepage": "https://hub.cybercinch.nz/cybercinch/ugly-queue",
     "license": "GPLv3",
 
     "authors" : [

scripts/build.sh

@@ -1,24 +1,32 @@
 #!/bin/bash
 
-mkdir -p ./build/tmp
+mkdir -p ./build/
 echo "Made temporary directory"
 
-# Package up the release
+# Package up the release (Needs to be .zip for upload to gitea)
-tar -czf "./build/ugly-queue-${1}.tar.gz" \
-  --exclude='./vendor' \
-  --exclude='./tests' \
-  --exclude='./build' \
-  .
-RELEASE_ID=$(curl --silent -X 'GET' "${GITEA_HOST}/api/v1/repos/cybercinch/ugly-queue/releases/latest" \
--H "accept: application/json" \
--H "Authorization: token ${GITEA_TOKEN}" | jq -r .id)
 
-# Attach to release
+zip -r "./build/Package.zip" \
-curl --silent -X 'POST' "${GITEA_HOST}/api/v1/repos/cybercinch/ugly-queue/releases/${RELEASE_ID}/assets?name=ugly-queue-${1}.tar.gz" \
+    . \
--H "Authorization: token ${GITEA_TOKEN}" \
+    -x '.semrel/*' \
---form attachment="@build/ugly-queue-${1}.tar.gz"
+    -x '.generated-go-semantic-release-changelog.md' \
+    -x './vendor/*' \
+    -x './tests/*' \
+    -x './build/*' \
+    -x './.git/*' \
+    -x './.idea/*' \
+    -x './.github/*' \
+    -x './scripts/*'
+
+#RELEASE_ID=$(curl --silent -X 'GET' "${GITEA_HOST}/api/v1/repos/cybercinch/ugly-queue/releases/latest" \
+#-H "accept: application/json" \
+#-H "Authorization: token ${GITEA_TOKEN}" | jq -r .id)
+#
+## Attach to release
+#curl --silent -X 'POST' "${GITEA_HOST}/api/v1/repos/cybercinch/ugly-queue/releases/${RELEASE_ID}/assets?name=ugly-queue-${1}.tar.gz" \
+#-H "Authorization: token ${GITEA_TOKEN}" \
+#--form attachment="@build/ugly-queue-${1}.tar.gz"
 
 # Upload the artifact to composer registry
-curl -H "Authorization: token ${GITEA_TOKEN}" \
+curl --user "cibot:${GITEA_TOKEN}" \
-     --upload-file "build/ugly-queue-${1}.tar.gz" \
+     --upload-file "build/ugly-queue.zip" \
      "${GITEA_HOST}/api/packages/cybercinch/composer?version=${1}"

src/UglyQueue.php

@@ -4,7 +4,7 @@ use DCarbone\Helpers\FileHelper;
 
 /**
  * Class UglyQueue
- * @package DCarbone
+ * @package Cybercinch
  */
 class UglyQueue implements \Serializable, \SplSubject, \Countable
 {

src/UglyQueueEnum.php

@@ -2,7 +2,7 @@
 
 /**
  * Class UglyQueueEnum
- * @package DCarbone
+ * @package Cybercinch
  *
  * Pseudo-enum thing.
  */

src/UglyQueueManager.php

@@ -1,8 +1,10 @@
 <?php namespace Cybercinch;
 
+use InvalidArgumentException;
+
 /**
  * Class UglyQueueManager
- * @package DCarbone
+ * @package Cybercinch
  */
 class UglyQueueManager implements \SplObserver, \Countable
 {
@@ -17,12 +19,12 @@ class UglyQueueManager implements \SplObserver, \Countable
      *
      * @param string $baseDir
      * @throws \RuntimeException
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function __construct($baseDir)
     {
         if (false === is_string($baseDir))
-            throw new \InvalidArgumentException('Argument 1 expected to be string, "'.gettype($baseDir).'" seen.');
+            throw new InvalidArgumentException('Argument 1 expected to be string, "'.gettype($baseDir).'" seen.');
 
         if (false === is_dir($baseDir))
             throw new \RuntimeException('"'.$baseDir.'" points to a directory that does not exist.');
@@ -40,7 +42,7 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param string $name
-     * @return UglyQueue|UglyQueueManager
+     * @return UglyQueue
      */
     public function getQueue($name)
     {
@@ -56,7 +58,7 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param UglyQueue $uglyQueue
-     * @return \DCarbone\UglyQueueManager
+     * @return UglyQueueManager
      * @throws \RuntimeException
      */
     public function addQueue(UglyQueue $uglyQueue)
@@ -111,7 +113,7 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param UglyQueue $uglyQueue
-     * @return \DCarbone\UglyQueueManager
+     * @return UglyQueueManager
      */
     public function removeQueue(UglyQueue $uglyQueue)
     {
@@ -124,7 +126,7 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param string $name
-     * @return \DCarbone\UglyQueueManager
+     * @return UglyQueueManager
      */
     public function removeQueueByName($name)
     {
@@ -136,15 +138,15 @@ class UglyQueueManager implements \SplObserver, \Countable
 
     /**
      * @param string $name
-     * @return \DCarbone\UglyQueue
+     * @return UglyQueue
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function getQueueWithName($name)
     {
         if (isset($this->queues[$name]))
             return $this->queues[$name];
 
-        throw new \InvalidArgumentException('Argument 1 expected to be valid queue name.');
+        throw new InvalidArgumentException('Argument 1 expected to be valid queue name.');
     }
 
     /**