From abd3137cfa40d529649dbdfebaeab6dc9dd40045 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 17 Jan 2023 15:58:19 +0800 Subject: [PATCH 1/4] use docker image --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27273e1..15d4a87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: build tauri for Linux - uses: ./devops/ubuntu + uses: getneil/tea-builder:latest - uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -106,15 +106,15 @@ jobs: strategy: matrix: platform: - - os: macos-11 - name: darwin+x86-64 - id: mac_latest + # - os: macos-11 + # name: darwin+x86-64 + # id: mac_latest - os: ubuntu-latest name: linux+x86-64 id: linux - - os: [self-hosted, macOS, ARM64] - name: darwin+aarch64 - id: mac_m1 + # - os: [self-hosted, macOS, ARM64] + # name: darwin+aarch64 + # id: mac_m1 # err: Package atk was not found in the pkg-config search path. # requires atk >= 2.18 # - os: [self-hosted, linux, ARM64] @@ -144,7 +144,7 @@ jobs: # uses: teaxyz/setup@v0 if: startsWith(matrix.platform.name, 'linux') # TODO: https://tauri.app/v1/guides/distribution/sign-linux - uses: ./devops/ubuntu + uses: getneil/tea-builder:latest - name: build platform output id: build_platform From c3896798b53ed3b0b8ec80ae0883afdc54dd3ae9 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 17 Jan 2023 16:02:30 +0800 Subject: [PATCH 2/4] add docker:// prefix --- .github/workflows/ci.yml | 4 ++-- .github/workflows/main.yml | 7 ++----- .github/workflows/release.yml | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15d4a87..cd50867 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: build tauri for Linux - uses: getneil/tea-builder:latest + uses: docker://getneil/tea-builder:latest - uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -144,7 +144,7 @@ jobs: # uses: teaxyz/setup@v0 if: startsWith(matrix.platform.name, 'linux') # TODO: https://tauri.app/v1/guides/distribution/sign-linux - uses: getneil/tea-builder:latest + uses: docker://getneil/tea-builder:latest - name: build platform output id: build_platform diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1b9e312..cc6e838 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,10 +39,7 @@ jobs: persist-credentials: false - name: build tauri for Linux if: startsWith(matrix.platform.name, 'linux') - run: | - sudo apt-get update - sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf pkg-config - sh <(curl https://tea.xyz) xc build + uses: docker://getneil/tea-builder:latest build_tauri: needs: changes @@ -84,7 +81,7 @@ jobs: # uses: teaxyz/setup@v0 if: startsWith(matrix.platform.name, 'linux') # TODO: https://tauri.app/v1/guides/distribution/sign-linux - uses: ./devops/ubuntu + uses: docker://getneil/tea-builder:latest - name: Get current unix ts - seconds id: date diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a20cb55..e7f2eaf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: # uses: teaxyz/setup@v0 if: startsWith(matrix.platform.name, 'linux') # TODO: https://tauri.app/v1/guides/distribution/sign-linux - uses: ./devops/ubuntu + uses: docker://getneil/tea-builder:latest - name: Get current unix ts - seconds From 0e9f0a255ecd8b41d8a537c78e8bdd6d3a6bdc5d Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 17 Jan 2023 16:05:34 +0800 Subject: [PATCH 3/4] cleanup --- modules/gui/src/routes/+layout.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/gui/src/routes/+layout.svelte b/modules/gui/src/routes/+layout.svelte index 9b6af43..47451c0 100644 --- a/modules/gui/src/routes/+layout.svelte +++ b/modules/gui/src/routes/+layout.svelte @@ -1,4 +1,3 @@ -