Merge branch 'master' of github.com:nukeop/nuclear

nukeop · Jul 14, 2024 · 3e438ab · 3e438ab
2 parents f3a565c + 022ba2b
commit 3e438ab
Show file tree

Hide file tree

Showing 39 changed files with 4,272 additions and 451 deletions.
diff --git a/.env b/.env
@@ -10,4 +10,4 @@ SOUNDCLOUD_API_KEY=22e8f71d7ca75e156d6b2f0e0a5172b3
 NUCLEAR_SERVICES_URL=https://qjrujsisccsvyvjnqtnq.supabase.co
 NUCLEAR_SERVICES_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InFqcnVqc2lzY2Nzdnl2am5xdG5xIiwicm9sZSI6ImFub24iLCJpYXQiOjE2NTY1OTY0NjEsImV4cCI6MTk3MjE3MjQ2MX0.WQWcwBAQFNE259f2o8ruFln_UMLTFEn5aUD7KHrs9Aw
 NUCLEAR_VERIFICATION_SERVICE_URL=https://nuclear-verification-service.fly.dev
-NUCLEAR_VERSION="0.6.30"
+NUCLEAR_VERSION="0.6.31"
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -70,7 +70,8 @@ jobs:
         platform:
           [
             { os: "ubuntu-latest", cmd: "build:linux" },
-            { os: "macos-11", cmd: "build:macos" },
+            { os: "macos-12", cmd: "build:macos" },
+            { os: "macos-14", cmd: "build:macos-arm64" },
             { os: "windows-latest", cmd: "build:windows" },
           ]
     steps:

diff --git a/.github/workflows/debug-build.yml b/.github/workflows/debug-build.yml
@@ -0,0 +1,78 @@
+name: Debug Build
+
+on:
+  workflow_dispatch:
+    inputs:
+      platform:
+        description: "Select the platform to build"
+        required: true
+        default: "linux"
+        type: choice
+        options:
+          - linux
+          - macos
+          - macos-arm64
+          - windows
+
+env:
+  PYTHON_VERSION: "3.11"
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-12, macos-14, windows-latest]
+        include:
+          - os: ubuntu-latest
+            platform: linux
+          - os: macos-12
+            platform: macos
+          - os: macos-14
+            platform: macos-arm64
+          - os: windows-latest
+            platform: windows
+
+    steps:
+      - name: Check platform
+        shell: bash
+        run: |
+          if [[ "${{ matrix.platform }}" != "${{ github.event.inputs.platform }}" ]]; then
+            echo "Platform '${{ matrix.platform }}' does not match selected platform '${{ github.event.inputs.platform }}'. Ending job."
+            exit 1
+          fi
+      - uses: actions/checkout@master
+      - name: Set up Python ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: get-npm-version
+        id: package-version
+        uses: pchynoweth/action-get-npm-version@1.1.1
+      - name: Use Node.js 20
+        uses: actions/setup-node@master
+        with:
+          version: 20
+          cache: npm
+      - name: add git binaries to PATH (Windows only)
+        if: matrix.os == 'windows-latest'
+        run: |
+          echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:\Program Files\Git\mingw64\libexec\git-core" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: install setup tools
+        if: runner.os == 'macOS'
+        run: |
+          sudo -H pip install setuptools
+      - run: npm ci
+      - run: npm run build:${{ matrix.platform }}
+        shell: bash
+        env:
+          VERSION: ${{ steps.package-version.outputs.version }}
+      - name: Upload debug binaries
+        uses: actions/upload-artifact@v2
+        with:
+          name: nuclear-binaries-${{ matrix.platform }}-debug
+          path: release/*.*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,6 +2,9 @@ name: Release job
 
 on: workflow_dispatch
 
+env:
+  PYTHON_VERSION: "3.11"
+
 jobs:
   linux_release:
     runs-on: ubuntu-latest
@@ -57,7 +60,7 @@ jobs:
           client-payload: '{"tag": "v${{ steps.package-version.outputs.version }}"}'
 
   mac_release:
-    runs-on: macos-11
+    runs-on: macos-12
     timeout-minutes: 30
 
     steps:
@@ -70,6 +73,9 @@ jobs:
         with:
           version: 20
           cache: npm
+      - name: install setup tools
+        run: |
+          sudo -H pip install setuptools
       - run: npm ci
       - run: npm run build:macos
         shell: bash
@@ -88,6 +94,45 @@ jobs:
           prerelease: true
           files: release/*.*
 
+  mac_arm64_release:
+    runs-on: macos-14
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@master
+      - name: Set up Python ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+      - name: get-npm-version
+        id: package-version
+        uses: pchynoweth/action-get-npm-version@1.1.1
+      - name: Use Node.js 20
+        uses: actions/setup-node@master
+        with:
+          version: 20
+          cache: npm
+      - name: install setup tools
+        run: |
+          sudo -H pip install setuptools
+      - run: npm ci
+      - run: npm run build:macos-arm64
+        shell: bash
+        env:
+          VERSION: ${{ steps.package-version.outputs.version }}
+      - name: Upload binaries
+        uses: actions/upload-artifact@v2
+        with:
+          name: nuclear-binaries-mac-arm64
+          path: release/*.*
+      - name: Create a release
+        uses: softprops/action-gh-release@v1
+        with:
+          name: v${{ steps.package-version.outputs.version }}
+          tag_name: v${{ steps.package-version.outputs.version }}
+          prerelease: true
+          files: release/*.*
+
   windows_release:
     runs-on: windows-latest
     timeout-minutes: 30

diff --git a/README.md b/README.md
@@ -3,6 +3,12 @@
 
 Desktop music player focused on streaming from free sources
 
+## IMPORTANT!
+
+There's currently an issue with playback caused by changes made by Google, we're tracking progress here: https://github.com/nukeop/nuclear/issues/1629
+
+----
+
 ![Showcase](https://i.imgur.com/8qHu66J.png)
 
 # Links

diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.6.30"
-}
+  "version": "0.6.31"
+}
diff --git a/nuclear.code-workspace b/nuclear.code-workspace
@@ -0,0 +1,36 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"name": "main",
+			"path": "packages/main"
+		},
+		{
+			"name": "i18n",
+			"path": "packages/i18n"
+		},
+		{
+			"name": "app",
+			"path": "packages/app"
+		},
+		{
+			"name": "core",
+			"path": "packages/core"
+		},
+		{
+			"name": "ui",
+			"path": "packages/ui"
+		}
+	],
+	"settings": {
+		"jest.disabledWorkspaceFolders": [
+			"main",
+			"i18n",
+			"app",
+			"core",
+			"ui"
+		]
+	}
+}