wip

elixir-desktop · Jan 8, 2024 · ea51903 · ea51903
1 parent ba0ef3a
commit ea51903
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   windows:
-    runs-on: windows-2022
+    runs-on: windows-latest
     timeout-minutes: 90
     defaults:
       run:
@@ -135,8 +135,6 @@ jobs:
 
     - name: "Get dependencies"
       shell: msys2 {0}
-      env:
-        ELIXIR_ERL_OPTIONS: "-noinput -noshell"
       run: |
         mix local.hex --force
         mix local.rebar --force
@@ -152,6 +150,7 @@ jobs:
         MAKE: make
         REBAR_TARGET_ARCH_WORDSIZE: 64 
         REBAR_TARGET_ARCH: x86_64-w64-mingw32
+        WIN32_KEY_PASS: ${{ secrets.WIN32_KEY_PASS }}
       shell: msys2 {0}
       run: |
         mix assets.deploy
@@ -161,7 +160,8 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: Windows-Installer
-        path: _build/prod/*.exe  
+        path: |
+          _build/prod/*.exe
 
   macos:
     runs-on: macos-11
@@ -182,7 +182,7 @@ jobs:
       if: steps.macos-cache.outputs.cache-hit != 'true'
       run: |
         mkdir ~/projects && cd ~/projects
-        git clone https://github.com/wxWidgets/wxWidgets.git
+        git clone ${{ env.WXWIDGETS_REPO }}
         cd wxWidgets; 
         git checkout ${{ env.WXWIDGETS_VERSION }}
         git submodule update --init
@@ -231,9 +231,11 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: MacOS-Installer
-        path: _build/prod/*.dmg
+        path: |
+          _build/prod/*.dmg
 
   linux-x86:
+    permissions: write-all    
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
@@ -245,7 +247,16 @@ jobs:
         registry: docker.pkg.github.com
         image_name: linux_installer
         dockerfile: scripts/Dockerfile
-        build_extra_args: "--build-arg=WXWIDGETS_REPO=${{ env.WXWIDGETS_REPO }} --build-arg=WXWIDGETS_VERSION=${{ env.WXWIDGETS_VERSION }} --build-arg=OTP_VERSION=${{ env.OTP_VERSION }} --build-arg=OTP_GITHUB_URL=${{ env.OTP_GITHUB_URL }} --build-arg=ELIXIR_VERSION=${{ env.ELIXIR_VERSION }} --build-arg=ELIXIR_VARIANT=${{ env.ELIXIR_VARIANT }}"
+        build_extra_args: |
+          --build-arg=BASE_IMAGE=ubuntu:18.04
+          --platform=linux/amd64
+          --build-arg=PLATFORM=amd64
+          --build-arg=WXWIDGETS_REPO=${{ env.WXWIDGETS_REPO }}
+          --build-arg=WXWIDGETS_VERSION=${{ env.WXWIDGETS_VERSION }}
+          --build-arg=OTP_VERSION=${{ env.OTP_VERSION }}
+          --build-arg=OTP_GITHUB_URL=${{ env.OTP_GITHUB_URL }}
+          --build-arg=ELIXIR_VERSION=${{ env.ELIXIR_VERSION }}
+          --build-arg=ELIXIR_VARIANT=${{ env.ELIXIR_VARIANT }}
 
     - name: Extract runfile
       run: |
@@ -258,6 +269,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: Linux-Installer
-        path: ./*.run
+        path: |
+          ./*.run
 
   
diff --git a/mix.lock b/mix.lock
@@ -13,7 +13,7 @@
   "debouncer": {:hex, :debouncer, "0.1.7", "a7f59fb55cdb54072aff8ece461f4d041d2a709da84e07ed0ab302d348724640", [:mix], [], "hexpm", "b7fd0623df8ab16933bb164d19769884b18c98cab8677cd53eed59587f290603"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "desktop": {:git, "https://github.com/elixir-desktop/desktop.git", "5176b519cab554227f3cb61c7d508f31e5adac67", []},
-  "desktop_deployment": {:git, "https://github.com/elixir-desktop/deployment.git", "09ef08ce5fe11639d06e90964a928a2a4870a1f9", []},
+  "desktop_deployment": {:git, "https://github.com/elixir-desktop/deployment.git", "73485cffa25a20b92db6421ebedf0cde2b510753", []},
   "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
   "ecto_sql": {:hex, :ecto_sql, "3.10.2", "6b98b46534b5c2f8b8b5f03f126e75e2a73c64f3c071149d32987a5378b0fdbd", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"},
   "ecto_sqlite3": {:hex, :ecto_sqlite3, "0.11.0", "1e094ade9ff1bc7c33c5c6b114f8a5156d0b7c5ddf9038d61cb8fdd61e7c4c55", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.10", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.10", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:exqlite, "~> 0.9", [hex: :exqlite, repo: "hexpm", optional: false]}], "hexpm", "3d5b9a69b9a9547329413b278b4b072b9bbadf4fd599a746b3d6b0e174a418bb"},