.github/workflows/main_matrix.yml

@@ -137,13 +137,6 @@ jobs:
   package-native:
     uses: ./.github/workflows/package_amd64.yml
 
-  build-debian-src:
-    uses: ./.github/workflows/build_debian_src.yml
-    with:
-      series: UNRELEASED
-      build_location: local
-    secrets: inherit
-
   test-native:
     uses: ./.github/workflows/test_native.yml
 
@@ -267,7 +260,6 @@ jobs:
         package-raspbian,
         package-raspbian-armv7l,
         package-native,
-        build-debian-src,
       ]
     steps:
       - name: Checkout
@@ -279,12 +271,8 @@ jobs:
           python-version: 3.x
 
       - name: Get release version string
-        run: |
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-          echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
         id: version
-        env:
-          BUILD_LOCATION: local
 
       - name: Create release
         uses: softprops/action-gh-release@v2
@@ -304,17 +292,6 @@ jobs:
           merge-multiple: true
           path: ./output
 
-      - name: Download source deb
-        uses: actions/download-artifact@v4
-        with:
-          pattern: firmware-debian-${{ steps.version.outputs.deb }}~UNRELEASED-src
-          merge-multiple: true
-          path: ./output/debian-src
-
-      - name: Zip source deb
-        working-directory: output
-        run: zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
-
       # For diagnostics
       - name: Display structure of downloaded files
         run: ls -lR
@@ -327,7 +304,6 @@ jobs:
             ./output/meshtasticd_${{ steps.version.outputs.long }}_arm64.deb
             ./output/meshtasticd_${{ steps.version.outputs.long }}_armhf.deb
             ./output/meshtasticd_${{ steps.version.outputs.long }}_amd64.deb
-            ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
 
       - name: Bump version.properties
         run: >-

.github/workflows/nightly_debian.yml

@@ -25,13 +25,13 @@ jobs:
         series: [plucky, oracular, noble, jammy]
     uses: ./.github/workflows/package_ppa.yml
     with:
-      ppa_repo: ppa:meshtastic/daily
+      ppa_repo: daily
       series: ${{ matrix.series }}
     secrets: inherit
 
   package-obs:
     uses: ./.github/workflows/package_obs.yml
     with:
-      obs_project: home:meshtastic:daily
+      obs_repo: meshtasticd
       series: unstable
     secrets: inherit

.github/workflows/package_obs.yml

@@ -3,15 +3,11 @@ name: Package for OpenSUSE Build Service
 on:
   workflow_call:
     secrets:
-      OBS_USERNAME:
-        required: true
-      OBS_PASSWORD:
-        required: true
       PPA_GPG_PRIVATE_KEY:
         required: true
     inputs:
-      obs_project:
+      obs_repo:
-        description: Meshtastic OBS project to target
+        description: Meshtastic OBS repo to target
         required: true
         type: string
       series:
@@ -68,43 +64,40 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -lah
 
-      - name: Configure osc
+      # - name: Configure osc
-        run: |
+      #   shell: bash
-          # Setup OpenSUSE Build Service credentials
+      #   env:
-          mkdir -p ~/.config/osc
+      #     OBS_USERNAME: ${{ secrets.OBS_USERNAME }}
-          echo "[general]" > ~/.config/osc/oscrc
+      #     OBS_PASSWORD: ${{ secrets.OBS_PASSWORD }}
-          echo "apiurl=https://api.opensuse.org" >> ~/.config/osc/oscrc
+      #   run: |
-          echo "[https://api.opensuse.org]" >> ~/.config/osc/oscrc
+      #     mkdir -p ~/.config/osc
-          echo "user=${{ secrets.OBS_USERNAME }}" >> ~/.config/osc/oscrc
+      #     echo -e "[https://api.opensuse.org]\n" > ~/.config/osc/oscrc
-          echo "pass=${{ secrets.OBS_PASSWORD }}" >> ~/.config/osc/oscrc
+      #     echo -e "user = $OBS_USERNAME" >> ~/.config/osc/oscrc
-          echo "credentials_mgr_class=osc.credentials.PlaintextConfigFileCredentialsManager" >> ~/.config/osc/oscrc
+      #     echo -e "pass = $OBS_PASSWORD" >> ~/.config/osc/oscrc
-          # Create a temporary directory for osc checkout
+      #     echo -e "aliases = obs" >> ~/.config/osc/oscrc
-          mkdir -p osc
+      #     # Authenticate to OBS
+      #     osc meta prj -v
 
-      # Intentionally fail if credentials are invalid
+      # - name: Upload Package to OBS
-      # Update secrets if this returns `401`
+      #   shell: bash
-      - name: Verify OBS authentication
+      #   run: |
-        run: osc token
+      #     # Define your OBS project and repository
+      #     OBS_PROJECT="application:meshtastic"
+      #     OBS_REPO="${{ inputs.obs_repo }}"
 
-      - name: Upload package to OBS
+      #     # Create a temporary directory for osc
-        shell: bash
+      #     mkdir -p /tmp/osc/$OBS_PROJECT/$OBS_REPO
-        working-directory: osc
+      #     cd /tmp/osc/$OBS_PROJECT/$OBS_REPO
-        env:
-          OBS_PROJECT: ${{ inputs.obs_project }}
-          OBS_PACKAGE: meshtasticd
-        run: |
-          # Initialize the package in the current directory
-          osc checkout --output-dir . $OBS_PROJECT $OBS_PACKAGE
 
-          # Remove the existing package files
+      #     # Initialize the package directory
-          rm -rf *.dsc *.tar.xz
+      #     osc checkout $OBS_PROJECT $OBS_REPO
 
-          # Copy new package files to the directory
+      #     # Copy package files to the osc directory
-          cp $GITHUB_WORKSPACE/*.dsc .
+      #     cp $GITHUB_WORKSPACE/*.dsc .
-          cp $GITHUB_WORKSPACE/*.tar.xz .
+      #     cp $GITHUB_WORKSPACE/*.tar.xz .
 
-          # Add/Remove the files
+      #     # Add files to osc
-          osc addremove
+      #     osc addremove
 
-          # Commit changes and push to OpenSUSE Build Service
+      #     # Commit and push the changes
-          osc commit -m "GitHub Actions: ${{ steps.version.outputs.deb }}~${{ inputs.series }}"
+      #     osc commit -m "Automated upload from GitHub Actions"

.github/workflows/package_ppa.yml

@@ -71,4 +71,4 @@ jobs:
       - name: Publish with dput
         if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
         run: |
-          dput ${{ inputs.ppa_repo }} meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes
+          dput ppa:meshtastic/${{ inputs.ppa_repo }} meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes

.github/workflows/release_channels.yml

@@ -15,15 +15,13 @@ jobs:
     uses: ./.github/workflows/package_ppa.yml
     with:
       ppa_repo: |-
-        ppa:meshtastic/${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
+        ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
       series: ${{ matrix.series }}
     secrets: inherit
 
-  package-obs:
+  # package-obs:
-    uses: ./.github/workflows/package_obs.yml
+  #   uses: ./.github/workflows/package_obs.yml
-    with:
+  #   with:
-      obs_project: |-
+  #     obs_repo: meshtasticd
-        home:meshtastic:${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
+  #     series: ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
-      series: |-
+  #   secrets: inherit
-        ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
-    secrets: inherit