ci: use CURL for cloudsmith.sh and enable RPM upload

diff --git a/.github/workflows/build-cloudsmith.yml b/.github/workflows/build-cloudsmith.yml
index 71296a149181941fb045ab1a74ff8fddbaae02b2..1da4632145d61b17b6d098b969c6c3d40f13034f 100644 (file)
--- a/.github/workflows/build-cloudsmith.yml
+++ b/.github/workflows/build-cloudsmith.yml
@@ -14,6 +14,9 @@ jobs:
     name: Build on Raspberry Pi ${{ matrix.arch }}
     env:
       GITHUB_ENV: CLOUDSMITH_API_KEY
+      CLOUDSMITH_ORG: ${{ vars.CLOUDSMITH_ORG }}
+      CLOUDSMITH_REPO: ${{ vars.CLOUDSMITH_REPO }}
+      CLOUDSMITH_OWNER: ${{ vars.CLOUDSMITH_OWNER }}
       CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}
     strategy:
       matrix:
@@ -102,6 +105,9 @@ jobs:
           # Pass some environment variables to the container
           env: | # YAML, but pipe character is necessary
             artifact_name: git-${{ matrix.distro }}_${{ matrix.arch }}
+            CLOUDSMITH_ORG: ${{ vars.CLOUDSMITH_ORG }}
+            CLOUDSMITH_REPO: ${{ vars.CLOUDSMITH_REPO }}
+            CLOUDSMITH_OWNER: ${{ vars.CLOUDSMITH_OWNER }}
             CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}
 
 
@@ -144,6 +150,7 @@ jobs:
             git config --global --add safe.directory /home/runner/work/tvheadend/tvheadend || true
             AUTOBUILD_CONFIGURE_EXTRA=--enable-ccache\ --enable-ffmpeg_static\ --enable-hdhomerun_static\ --python=python3 ./Autobuild.sh
             cp ../tvheadend*.deb /artifacts/
+            if [ '${{ matrix.distro }}' = 'buster' ] && [ '${{ matrix.arch }}' = 'armv7' ]; then update-ca-certificates --fresh; fi
             support/cloudsmith.sh -f '../tvheadend*.deb'
       - uses: actions/upload-artifact@v3
         with:
@@ -201,6 +208,9 @@ jobs:
       - name: upload-cloudsmith
         run: support/cloudsmith.sh -f 'tvheadend*.deb'
         env:
+          CLOUDSMITH_ORG: ${{ vars.CLOUDSMITH_ORG }}
+          CLOUDSMITH_REPO: ${{ vars.CLOUDSMITH_REPO }}
+          CLOUDSMITH_OWNER: ${{ vars.CLOUDSMITH_OWNER }}
           CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}
 
   build-rpm-native:
@@ -231,7 +241,10 @@ jobs:
           name: Tvheadend-RPM
           path: tvheadend*.rpm
           if-no-files-found: error
-      # - name: upload-cloudsmith
-      #   run: support/cloudsmith.sh -f 'tvheadend*.rpm'
-      #   env:
-      #     CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}
+      - name: upload-cloudsmith
+        run: support/cloudsmith.sh -f 'tvheadend*.rpm'
+        env:
+          CLOUDSMITH_ORG: ${{ vars.CLOUDSMITH_ORG }}
+          CLOUDSMITH_REPO: ${{ vars.CLOUDSMITH_REPO }}
+          CLOUDSMITH_OWNER: ${{ vars.CLOUDSMITH_OWNER }}
+          CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_KEY }}

diff --git a/Autobuild/identify-os.sh b/Autobuild/identify-os.sh
index df9a57b755438942afd42ec2dee68e2d1208a7c8..4e55488c081ef1dccea210e9104c221589cc400e 100644 (file)
--- a/Autobuild/identify-os.sh
+++ b/Autobuild/identify-os.sh
@@ -12,6 +12,10 @@ if [ "$UNAME" == "linux" ]; then
     # Otherwise, use release info file
     elif [ -f /etc/os-release ]; then
         export DISTRO=$(awk -F= '/^VERSION_CODENAME/{print $2}' /etc/os-release)
+        # Fedora uses VERSION_ID
+        if [ "$DISTRO" == '""' ]; then
+            export DISTRO=$(awk -F= '/^VERSION_ID/{print $2}' /etc/os-release)
+        fi
         echo "OS identified using os-release file"
     else
         export DISTRO=$(ls -d /etc/[A-Za-z]*[_-][rv]e[lr]* | grep -v "lsb" | cut -d'/' -f3 | cut -d'-' -f1 | cut -d'_' -f1)

diff --git a/support/cloudsmith.sh b/support/cloudsmith.sh
index 5a65c26a25af5d6e0aa1a6d35e07dfae9b4daf6a..1d86855e96f5dcf3e276982a9357dde7cd649593 100755 (executable)
--- a/support/cloudsmith.sh
+++ b/support/cloudsmith.sh
@@ -49,47 +49,51 @@ case $OSPREFIX$TARGET in
         OS="ubuntu";;
     raspios*)
         OS="raspbian";;
+    37|38|39)
+        OS="fedora";;
+    40|41)
+        echo "Fedora 40 and 41 (current rawhide) are not (yet) supported by Cloudsmith" && exit;;
     *) echo "OS $TARGET could not be recognized" && exit 1;;
 esac
 
 export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
-export DEBIAN_FRONTEND=noninteractive
 
-# Since Python 3.11, this flag is required to install pip packages globally
-export PIP_BREAK_SYSTEM_PACKAGES=1
-    
-apt install --force-yes -y python3.7 || true
-
-# Use ensurepip to bootstrap pip if available, else install from apt
-python3 -m ensurepip || apt install --force-yes -y python3-pip || apt install --force-yes -y python-pip
-
-# Get the major and minor version of the installed Python
-python_version=$(python3 -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
-
-# Compare versions and upgrade pip accordingly
-if [[ "$python_version" == "3.3" ]]; then
-    python3 -m pip install --upgrade 'pip<10.0.2' 'colorama==0.4.1' 'urllib3==1.22'
-elif [[ "$python_version" == "3.4" ]]; then
-    python3 -m pip install --ignore-installed --upgrade 'pip<19.2' 'colorama==0.4.1' 'urllib3==1.24.3' 'requests==2.21.0' 'six==1.16.0' 'certifi==2021.10.8'
-elif [[ "$python_version" == "3.5" ]]; then
-    python3 -m pip install --upgrade 'pip<20.4'
-elif [[ "$python_version" == "3.6" ]]; then
-    python3 -m pip install --upgrade 'pip<22.0'
+if [ $OS == "fedora" ]; then
+    dnf install -y curl
 else
-    # For Python 3.7 and above, install the latest version of pip
-    python3 -m pip install --upgrade pip
+    export DEBIAN_FRONTEND=noninteractive
+    apt update
+    apt install -y curl
 fi
 
-pip3 install --upgrade cloudsmith-cli || pip install --upgrade cloudsmith-cli || pip2 install --upgrade cloudsmith-cli
-python3 /usr/local/bin/cloudsmith --version || python /usr/local/bin/cloudsmith --version || cloudsmith --version
-
 FILEARRAY=($FILE)
-
 for package in "${FILEARRAY[@]}"; do
+    EXTENSION=${package##*.}
+    PKGBASENAME=$(basename $package)
+    # dryrun exit is performed as late as possible to catch any earlier potential issues
     if [ $DRYRUN = "1" ]; then
-        echo "DRYRUN MODE: Skip pushing tvheadend/tvheadend/$OS/$TARGET $package"
-    else
-        python3 /usr/local/bin/cloudsmith push deb "tvheadend/tvheadend/$OS/$TARGET" $package || python /usr/local/bin/cloudsmith push deb "tvheadend/tvheadend/$OS/$TARGET" $package || cloudsmith push deb "tvheadend/tvheadend/$OS/$TARGET" $package
+        echo "DRYRUN MODE: Skip pushing $OS $TARGET package $package"
+        continue
     fi
+    # upload package to file upload endpoint
+    curlUpload=$(
+        curl \
+            --upload-file $package \
+            -u "$CLOUDSMITH_OWNER:$CLOUDSMITH_API_KEY" \
+            -H "Content-Sha256: $(sha256sum "$package" | cut -f1 -d' ')" \
+            https://upload.cloudsmith.io/$CLOUDSMITH_ORG/$CLOUDSMITH_REPO/$PKGBASENAME \
+    )
+    IDENTIFIER=$(echo $curlUpload | cut -f 4 -d '"')
+    # finalize by POSTing to the create package endpoint
+    curl \
+        -X POST \
+        -H "Content-Type: application/json" \
+        -u "$CLOUDSMITH_OWNER:$CLOUDSMITH_API_KEY" \
+        -d "{
+                \"package_file\": \"$IDENTIFIER\",
+                \"distribution\": \"$OS/$TARGET\"
+            }" \
+        https://api-prd.cloudsmith.io/v1/packages/$CLOUDSMITH_ORG/$CLOUDSMITH_REPO/upload/$EXTENSION/
+    echo
 done