From 9a311794c5f1d5d6b4043e7291a01298ccf267ce Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 17:29:56 -0500 Subject: [PATCH 01/10] test split jobs --- .github/workflows/main.yml | 152 +++++++++++++++++++++++-------------- 1 file changed, 97 insertions(+), 55 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cc6e838..8e08c52 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - notorize jobs: @@ -59,33 +60,55 @@ jobs: container: ${{ matrix.platform.container }} steps: - uses: actions/checkout@v3 + - uses: teaxyz/setup@v0 - name: build tauri for MacOS - # uses: teaxyz/setup@v0 if: startsWith(matrix.platform.name, 'darwin') - # FROM: https://tauri.app/v1/guides/distribution/sign-macos - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ENABLE_CODE_SIGNING: ${{ secrets.GUI_APPLE_CERTIFICATE }} - APPLE_CERTIFICATE: ${{ secrets.GUI_APPLE_CERTIFICATE }} - APPLE_CERTIFICATE_PASSWORD: ${{ secrets.GUI_APPLE_CERTIFICATE_PASSWORD }} - APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} - # todo: uncomment when m1 with latest xcode is deployed - # this only helps in notarization - # APPLE_ID: ${{ secrets.APPLE_ID }} - # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - run: | - sh <(curl https://tea.xyz) -ES xc build + run: tea -ES xc build - name: build tauri for Linux - # uses: teaxyz/setup@v0 if: startsWith(matrix.platform.name, 'linux') # TODO: https://tauri.app/v1/guides/distribution/sign-linux uses: docker://getneil/tea-builder:latest + - run: | + tar -czvf artifacts.tgz -C ./modules/gui/src-tauri/target/release/bundle . + + - name: upload artifacts + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.platform.name }} + path: artifacts.tgz + if-no-files-found: error + + notorize_tauri: + needs: [build_tauri] + runs-on: macos-11 + steps: + - run: > + true + + upload: + needs: [build_tauri, notorize_tauri] + runs-on: ubuntu-latest + strategy: + matrix: + platform: + - darwin+x86-64 + - linux+x86-64 + - darwin+aarch64 + # - linux+aarch64 + steps: + - uses: actions/download-artifact@v3 + with: + name: ${{ matrix.platform }} + + - run: tar xzf artifacts.tgz + - name: Get current unix ts - seconds id: date run: echo "unix_seconds=$(date +'%s')" >> $GITHUB_OUTPUT + - uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -95,53 +118,72 @@ jobs: - name: build platform output id: build_platform env: - platform: ${{ matrix.platform.name }} + platform: ${{ matrix.platform }} run: | BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") EXTENSION=dmg - [[ $BUILD_PLATFORM = "x86-64" ]] && BUILD_PLATFORM="x64" || BUILD_PLATFORM=$BUILD_PLATFORM - [[ $platform = "linux+x86-64" ]] && BUILD_PLATFORM="amd64" || BUILD_PLATFORM=$BUILD_PLATFORM - [[ $platform = "linux+x86-64" ]] && EXTENSION="deb" + case $platform in + "linux+x86-64") + BUILD_PLATFORM="amd64" + EXTENSION="deb" + ;; + "linux+aarch64") + BUILD_PLATFORM="aarch64" + EXTENSION="deb" + ;; + "darwin+aarch64") + BUILD_PLATFORM="aarch64" + EXTENSION="dmg" + ;; + "darwin+x86-64") + BUILD_PLATFORM="x64" + EXTENSION="dmg" + ;; + *) + echo "Unknown platform $platform" + exit 1 + ;; + esac echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - + - name: zip .app for MacOS - if: startsWith(matrix.platform.name, 'darwin') + if: startsWith(matrix.platform, 'darwin') run: | - cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app + cd ./macos/ && zip -r tea.zip tea.app - - name: cp package images from prod to gui bucket - env: - platform: ${{ steps.build_platform.outputs.build_platform }} - build_platform: ${{ matrix.platform.name }} - extension: ${{steps.build_platform.outputs.extension}} - run: | - aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ - "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.$extension" + # - name: cp package images from prod to gui bucket + # env: + # platform: ${{ steps.build_platform.outputs.build_platform }} + # build_platform: ${{ matrix.platform }} + # extension: ${{steps.build_platform.outputs.extension}} + # run: | + # aws s3 cp "./$extension/tea_0.1.0_$platform.$extension" \ + # "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.$extension" - - name: cp package zip for MacOS - if: startsWith(matrix.platform.name, 'darwin') - env: - platform: ${{ steps.build_platform.outputs.build_platform }} - build_platform: ${{ matrix.platform.name }} - run: | - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.zip" - - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: Slack Notification - run: ./.github/notify-slack.js - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - PLATFORM: ${{ matrix.platform.name }} - EXT: ${{ steps.build_platform.outputs.extension }} - DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} + # - name: cp package zip for MacOS + # if: startsWith(matrix.platform, 'darwin') + # env: + # platform: ${{ steps.build_platform.outputs.build_platform }} + # build_platform: ${{ matrix.platform }} + # run: | + # aws s3 cp ./macos/tea.zip "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.zip" + # - uses: actions/setup-node@v3 + # with: + # node-version: 18 + # - name: Slack Notification + # run: ./.github/notify-slack.js + # env: + # SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + # PLATFORM: ${{ matrix.platform }} + # EXT: ${{ steps.build_platform.outputs.extension }} + # DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} - - name: Slack Notification for .app Mac - run: ./.github/notify-slack.js - if: startsWith(matrix.platform.name, 'darwin') - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - PLATFORM: ${{ matrix.platform.name }} - EXT: .zip(.app) - DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.zip + # - name: Slack Notification for .app Mac + # run: ./.github/notify-slack.js + # if: startsWith(matrix.platform, 'darwin') + # env: + # SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + # PLATFORM: ${{ matrix.platform }} + # EXT: .zip(.app) + # DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.zip From 2e3e1436e41b4132f1b819189de1557c75325221 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 17:32:30 -0500 Subject: [PATCH 02/10] trigger change Signed-off-by: Jacob Heider --- modules/ui/src/app.css | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ui/src/app.css b/modules/ui/src/app.css index 1c245db..1e5e0ff 100644 --- a/modules/ui/src/app.css +++ b/modules/ui/src/app.css @@ -13,3 +13,4 @@ font-family: 'sono'; src: url('../static/fonts/Sono-Light.woff2'); } + From 84c3ce2b2d0ebd93cb4d533e9d6b50b8afa243b3 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 17:34:39 -0500 Subject: [PATCH 03/10] better trigger change --- modules/gui/src-tauri/src/main.rs | 16 ++++++++-------- modules/ui/src/app.css | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/gui/src-tauri/src/main.rs b/modules/gui/src-tauri/src/main.rs index 1775339..66a52b5 100644 --- a/modules/gui/src-tauri/src/main.rs +++ b/modules/gui/src-tauri/src/main.rs @@ -1,15 +1,15 @@ #![cfg_attr( - all(not(debug_assertions), target_os = "windows"), - windows_subsystem = "windows" + all(not(debug_assertions), target_os = "windows"), + windows_subsystem = "windows" )] mod handlers; fn main() { - tauri::Builder::default() - .invoke_handler(tauri::generate_handler![ - handlers::packages::install_package, - ]) - .run(tauri::generate_context!()) - .expect("error while running tauri application"); + tauri::Builder::default() + .invoke_handler(tauri::generate_handler![ + handlers::packages::install_package, + ]) + .run(tauri::generate_context!()) + .expect("error while running tauri application"); } diff --git a/modules/ui/src/app.css b/modules/ui/src/app.css index 1e5e0ff..1c245db 100644 --- a/modules/ui/src/app.css +++ b/modules/ui/src/app.css @@ -13,4 +13,3 @@ font-family: 'sono'; src: url('../static/fonts/Sono-Light.woff2'); } - From 870164d4c1196672bf97ba3f9506f5d459dc57dc Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 17:40:21 -0500 Subject: [PATCH 04/10] fix for linux git issue --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e08c52..7e78982 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -66,6 +66,9 @@ jobs: if: startsWith(matrix.platform.name, 'darwin') run: tea -ES xc build + # git on Linux panics tea --sync otherwise + - run: git config --global --add safe.directory $TEA_PREFIX + - name: build tauri for Linux if: startsWith(matrix.platform.name, 'linux') # TODO: https://tauri.app/v1/guides/distribution/sign-linux From ca850c6d3f4b11086e987abc9944ab7497d0ebba Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 17:42:06 -0500 Subject: [PATCH 05/10] disable test/ci for now --- .github/workflows/ci.yml | 408 +++++++++++++++++++-------------------- 1 file changed, 204 insertions(+), 204 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f532cd..9910210 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,219 +1,219 @@ -name: "test" -on: [pull_request] +# name: "test" +# on: [pull_request] -jobs: - changes: - runs-on: ubuntu-latest - outputs: - svelte: ${{steps.svelte.outputs.src}} - tauri: ${{steps.tauri.outputs.src}} - preview_folder: ${{steps.preview.outputs.folder}} - steps: - - uses: actions/checkout@v3 - - uses: dorny/paths-filter@v2 - id: svelte - with: - filters: | - src: - - 'modules/gui/src/**' - - 'modules/ui/**' - - uses: dorny/paths-filter@v2 - id: tauri - with: - filters: | - src: - - 'modules/gui/src-tauri/**' - - 'modules/gui/src/**' - - 'modules/ui/src/**' - - name: get s3 preview folder - id: preview - run: echo "folder=${{ github.event.number }}-merge" >> $GITHUB_OUTPUT - no_preview: - needs: changes - if: needs.changes.outputs.svelte == 'false' - runs-on: ubuntu-latest - steps: - - name: comment preview site - uses: mshick/add-pr-comment@v2 - with: - message-id: preview-comment-${{needs.changes.outputs.preview_folder}} - message: | - no preview or changes related to UI - test: - needs: changes - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - persist-credentials: false - - uses: pnpm/action-setup@v2 - with: - version: 7 - - name: setup node - uses: actions/setup-node@v1 - with: - node-version: 18 - cache: 'pnpm' - cache-dependency-path: pnpm-lock.yaml - - name: install app dependencies - run: pnpm install - - name: unit test - run: pnpm --filter gui run coverage - - name: lint - run: pnpm -r lint - build_svelte: - needs: changes - if: needs.changes.outputs.svelte == 'true' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: build tauri for Linux - uses: docker://getneil/tea-builder:latest - - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - name: sync web files into preview folder - env: - prefix: ${{ needs.changes.outputs.preview_folder }} - run: | - aws s3 sync ./modules/gui/build \ - "s3://preview.gui.tea.xyz/$prefix" - - name: Install package - run: sudo apt-get install -y jq coreutils - - name: setup preview - id: preview_setup - run: .github/create-invalidate-preview.sh ${{ needs.changes.outputs.preview_folder }} +# jobs: +# changes: +# runs-on: ubuntu-latest +# outputs: +# svelte: ${{steps.svelte.outputs.src}} +# tauri: ${{steps.tauri.outputs.src}} +# preview_folder: ${{steps.preview.outputs.folder}} +# steps: +# - uses: actions/checkout@v3 +# - uses: dorny/paths-filter@v2 +# id: svelte +# with: +# filters: | +# src: +# - 'modules/gui/src/**' +# - 'modules/ui/**' +# - uses: dorny/paths-filter@v2 +# id: tauri +# with: +# filters: | +# src: +# - 'modules/gui/src-tauri/**' +# - 'modules/gui/src/**' +# - 'modules/ui/src/**' +# - name: get s3 preview folder +# id: preview +# run: echo "folder=${{ github.event.number }}-merge" >> $GITHUB_OUTPUT +# no_preview: +# needs: changes +# if: needs.changes.outputs.svelte == 'false' +# runs-on: ubuntu-latest +# steps: +# - name: comment preview site +# uses: mshick/add-pr-comment@v2 +# with: +# message-id: preview-comment-${{needs.changes.outputs.preview_folder}} +# message: | +# no preview or changes related to UI +# test: +# needs: changes +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v3 +# with: +# persist-credentials: false +# - uses: pnpm/action-setup@v2 +# with: +# version: 7 +# - name: setup node +# uses: actions/setup-node@v1 +# with: +# node-version: 18 +# cache: 'pnpm' +# cache-dependency-path: pnpm-lock.yaml +# - name: install app dependencies +# run: pnpm install +# - name: unit test +# run: pnpm --filter gui run coverage +# - name: lint +# run: pnpm -r lint +# build_svelte: +# needs: changes +# if: needs.changes.outputs.svelte == 'true' +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v3 +# - name: build tauri for Linux +# uses: docker://getneil/tea-builder:latest +# - uses: aws-actions/configure-aws-credentials@v1 +# with: +# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} +# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} +# aws-region: us-east-1 +# - name: sync web files into preview folder +# env: +# prefix: ${{ needs.changes.outputs.preview_folder }} +# run: | +# aws s3 sync ./modules/gui/build \ +# "s3://preview.gui.tea.xyz/$prefix" +# - name: Install package +# run: sudo apt-get install -y jq coreutils +# - name: setup preview +# id: preview_setup +# run: .github/create-invalidate-preview.sh ${{ needs.changes.outputs.preview_folder }} - - name: comment preview site - uses: mshick/add-pr-comment@v2 - with: - message-id: preview-comment-${{needs.changes.outputs.preview_folder}} - message: | - **preview is at**: - here - ```bash - https://${{steps.preview_setup.outputs.domain}} - ``` - copy-paste into a browser to view +# - name: comment preview site +# uses: mshick/add-pr-comment@v2 +# with: +# message-id: preview-comment-${{needs.changes.outputs.preview_folder}} +# message: | +# **preview is at**: +# here +# ```bash +# https://${{steps.preview_setup.outputs.domain}} +# ``` +# copy-paste into a browser to view - build_tauri: - needs: changes - if: needs.changes.outputs.tauri == 'true' - runs-on: ${{ matrix.platform.os }} - strategy: - matrix: - platform: - - 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 - # err: Package atk was not found in the pkg-config search path. - # requires atk >= 2.18 - # - os: [self-hosted, linux, ARM64] - # name: linux+aarch64 - container: ${{ matrix.platform.container }} - steps: - - uses: actions/checkout@v3 +# build_tauri: +# needs: changes +# if: needs.changes.outputs.tauri == 'true' +# runs-on: ${{ matrix.platform.os }} +# strategy: +# matrix: +# platform: +# - 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 +# # err: Package atk was not found in the pkg-config search path. +# # requires atk >= 2.18 +# # - os: [self-hosted, linux, ARM64] +# # name: linux+aarch64 +# container: ${{ matrix.platform.container }} +# steps: +# - uses: actions/checkout@v3 - - name: build tauri for MacOS - # uses: teaxyz/setup@v0 - if: startsWith(matrix.platform.name, 'darwin') - # FROM: https://tauri.app/v1/guides/distribution/sign-macos - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ENABLE_CODE_SIGNING: ${{ secrets.GUI_APPLE_CERTIFICATE }} - APPLE_CERTIFICATE: ${{ secrets.GUI_APPLE_CERTIFICATE }} - APPLE_CERTIFICATE_PASSWORD: ${{ secrets.GUI_APPLE_CERTIFICATE_PASSWORD }} - APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} - # TODO: uncomment once isolated m1 runner is setup with latest xcode - # only used for notarization - # APPLE_ID: ${{ secrets.APPLE_ID }} - # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - run: | - sh <(curl https://tea.xyz) -ES xc build +# - name: build tauri for MacOS +# # uses: teaxyz/setup@v0 +# if: startsWith(matrix.platform.name, 'darwin') +# # FROM: https://tauri.app/v1/guides/distribution/sign-macos +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# ENABLE_CODE_SIGNING: ${{ secrets.GUI_APPLE_CERTIFICATE }} +# APPLE_CERTIFICATE: ${{ secrets.GUI_APPLE_CERTIFICATE }} +# APPLE_CERTIFICATE_PASSWORD: ${{ secrets.GUI_APPLE_CERTIFICATE_PASSWORD }} +# APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} +# # TODO: uncomment once isolated m1 runner is setup with latest xcode +# # only used for notarization +# # APPLE_ID: ${{ secrets.APPLE_ID }} +# # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} +# run: | +# sh <(curl https://tea.xyz) -ES xc build - - name: build tauri for Linux - # uses: teaxyz/setup@v0 - if: startsWith(matrix.platform.name, 'linux') - # TODO: https://tauri.app/v1/guides/distribution/sign-linux - uses: docker://getneil/tea-builder:latest +# - name: build tauri for Linux +# # uses: teaxyz/setup@v0 +# if: startsWith(matrix.platform.name, 'linux') +# # TODO: https://tauri.app/v1/guides/distribution/sign-linux +# uses: docker://getneil/tea-builder:latest - - name: build platform output - id: build_platform - env: - platform: ${{ matrix.platform.name }} - run: | - EXTENSION=dmg - BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") - [[ $BUILD_PLATFORM = "x86-64" ]] && BUILD_PLATFORM="x64" || BUILD_PLATFORM=$BUILD_PLATFORM - [[ $platform = "linux+x86-64" ]] && BUILD_PLATFORM="amd64" || BUILD_PLATFORM=$BUILD_PLATFORM - [[ $platform = "linux+x86-64" ]] && EXTENSION="deb" - echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT - echo "extension=$EXTENSION" >> $GITHUB_OUTPUT +# - name: build platform output +# id: build_platform +# env: +# platform: ${{ matrix.platform.name }} +# run: | +# EXTENSION=dmg +# BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") +# [[ $BUILD_PLATFORM = "x86-64" ]] && BUILD_PLATFORM="x64" || BUILD_PLATFORM=$BUILD_PLATFORM +# [[ $platform = "linux+x86-64" ]] && BUILD_PLATFORM="amd64" || BUILD_PLATFORM=$BUILD_PLATFORM +# [[ $platform = "linux+x86-64" ]] && EXTENSION="deb" +# echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT +# echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - - name: zip .app for MacOS - if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' - run: | - cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app +# - name: zip .app for MacOS +# if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' +# run: | +# cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app - - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 +# - uses: aws-actions/configure-aws-credentials@v1 +# with: +# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} +# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} +# aws-region: us-east-1 - - name: cp package images from prod to preview bucket - env: - prefix: ${{ needs.changes.outputs.preview_folder }} - platform: ${{ steps.build_platform.outputs.build_platform }} - extension: ${{ steps.build_platform.outputs.extension }} - run: | - aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ - "s3://preview.gui.tea.xyz/$prefix/tea_$platform.$extension" +# - name: cp package images from prod to preview bucket +# env: +# prefix: ${{ needs.changes.outputs.preview_folder }} +# platform: ${{ steps.build_platform.outputs.build_platform }} +# extension: ${{ steps.build_platform.outputs.extension }} +# run: | +# aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ +# "s3://preview.gui.tea.xyz/$prefix/tea_$platform.$extension" - - name: cp package zip for MacOS - if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' - env: - prefix: ${{ needs.changes.outputs.preview_folder }} - platform: ${{ steps.build_platform.outputs.build_platform }} - run: | - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" +# - name: cp package zip for MacOS +# if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' +# env: +# prefix: ${{ needs.changes.outputs.preview_folder }} +# platform: ${{ steps.build_platform.outputs.build_platform }} +# run: | +# aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" - - name: comment install for Linux - if: startsWith(matrix.platform.name, 'linux') - uses: mshick/add-pr-comment@v2 - with: - message-id: ${{ matrix.platform.id }}-comment - message: | - **installer for Linux ${{ matrix.platform.name }} is at**: - here +# - name: comment install for Linux +# if: startsWith(matrix.platform.name, 'linux') +# uses: mshick/add-pr-comment@v2 +# with: +# message-id: ${{ matrix.platform.id }}-comment +# message: | +# **installer for Linux ${{ matrix.platform.name }} is at**: +# here - ```bash - http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} - ``` - copy-paste into a browser to download +# ```bash +# http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} +# ``` +# copy-paste into a browser to download - - name: comment install for MacOS - if: startsWith(matrix.platform.name, 'darwin') - uses: mshick/add-pr-comment@v2 - with: - message-id: ${{ matrix.platform.id }}-comment - message: | - **installers for MacOS ${{ matrix.platform.name }} is at**: - .zip - or - .dmg +# - name: comment install for MacOS +# if: startsWith(matrix.platform.name, 'darwin') +# uses: mshick/add-pr-comment@v2 +# with: +# message-id: ${{ matrix.platform.id }}-comment +# message: | +# **installers for MacOS ${{ matrix.platform.name }} is at**: +# .zip +# or +# .dmg - ```bash - http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.zip - http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.dmg - ``` - copy-paste into a browser to download \ No newline at end of file +# ```bash +# http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.zip +# http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.dmg +# ``` +# copy-paste into a browser to download \ No newline at end of file From 2e64763141702fedea8d4f469fcbf692d7ce1d99 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 17:45:05 -0500 Subject: [PATCH 06/10] tea and docker are conflicting --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7e78982..4c59c43 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,14 +61,12 @@ jobs: steps: - uses: actions/checkout@v3 - uses: teaxyz/setup@v0 + if: startsWith(matrix.platform.name, 'darwin') - name: build tauri for MacOS if: startsWith(matrix.platform.name, 'darwin') run: tea -ES xc build - # git on Linux panics tea --sync otherwise - - run: git config --global --add safe.directory $TEA_PREFIX - - name: build tauri for Linux if: startsWith(matrix.platform.name, 'linux') # TODO: https://tauri.app/v1/guides/distribution/sign-linux From aef0e2a2a10df7ca89177b569eb41efabfdf321b Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 18:20:05 -0500 Subject: [PATCH 07/10] add notarization --- .github/workflows/ci.yml | 409 ++++++++++++++++++------------------- .github/workflows/main.yml | 33 ++- 2 files changed, 228 insertions(+), 214 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9910210..411a8d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,219 +1,218 @@ -# name: "test" -# on: [pull_request] +name: "test" +on: [pull_request] +jobs: + changes: + runs-on: ubuntu-latest + outputs: + svelte: ${{steps.svelte.outputs.src}} + tauri: ${{steps.tauri.outputs.src}} + preview_folder: ${{steps.preview.outputs.folder}} + steps: + - uses: actions/checkout@v3 + - uses: dorny/paths-filter@v2 + id: svelte + with: + filters: | + src: + - 'modules/gui/src/**' + - 'modules/ui/**' + - uses: dorny/paths-filter@v2 + id: tauri + with: + filters: | + src: + - 'modules/gui/src-tauri/**' + - 'modules/gui/src/**' + - 'modules/ui/src/**' + - name: get s3 preview folder + id: preview + run: echo "folder=${{ github.event.number }}-merge" >> $GITHUB_OUTPUT + no_preview: + needs: changes + if: needs.changes.outputs.svelte == 'false' + runs-on: ubuntu-latest + steps: + - name: comment preview site + uses: mshick/add-pr-comment@v2 + with: + message-id: preview-comment-${{needs.changes.outputs.preview_folder}} + message: | + no preview or changes related to UI + test: + needs: changes + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + persist-credentials: false + - uses: pnpm/action-setup@v2 + with: + version: 7 + - name: setup node + uses: actions/setup-node@v1 + with: + node-version: 18 + cache: 'pnpm' + cache-dependency-path: pnpm-lock.yaml + - name: install app dependencies + run: pnpm install + - name: unit test + run: pnpm --filter gui run coverage + - name: lint + run: pnpm -r lint + build_svelte: + needs: changes + if: needs.changes.outputs.svelte == 'true' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: build tauri for Linux + uses: docker://getneil/tea-builder:latest + - uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + - name: sync web files into preview folder + env: + prefix: ${{ needs.changes.outputs.preview_folder }} + run: | + aws s3 sync ./modules/gui/build \ + "s3://preview.gui.tea.xyz/$prefix" + - name: Install package + run: sudo apt-get install -y jq coreutils + - name: setup preview + id: preview_setup + run: .github/create-invalidate-preview.sh ${{ needs.changes.outputs.preview_folder }} -# jobs: -# changes: -# runs-on: ubuntu-latest -# outputs: -# svelte: ${{steps.svelte.outputs.src}} -# tauri: ${{steps.tauri.outputs.src}} -# preview_folder: ${{steps.preview.outputs.folder}} -# steps: -# - uses: actions/checkout@v3 -# - uses: dorny/paths-filter@v2 -# id: svelte -# with: -# filters: | -# src: -# - 'modules/gui/src/**' -# - 'modules/ui/**' -# - uses: dorny/paths-filter@v2 -# id: tauri -# with: -# filters: | -# src: -# - 'modules/gui/src-tauri/**' -# - 'modules/gui/src/**' -# - 'modules/ui/src/**' -# - name: get s3 preview folder -# id: preview -# run: echo "folder=${{ github.event.number }}-merge" >> $GITHUB_OUTPUT -# no_preview: -# needs: changes -# if: needs.changes.outputs.svelte == 'false' -# runs-on: ubuntu-latest -# steps: -# - name: comment preview site -# uses: mshick/add-pr-comment@v2 -# with: -# message-id: preview-comment-${{needs.changes.outputs.preview_folder}} -# message: | -# no preview or changes related to UI -# test: -# needs: changes -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# with: -# persist-credentials: false -# - uses: pnpm/action-setup@v2 -# with: -# version: 7 -# - name: setup node -# uses: actions/setup-node@v1 -# with: -# node-version: 18 -# cache: 'pnpm' -# cache-dependency-path: pnpm-lock.yaml -# - name: install app dependencies -# run: pnpm install -# - name: unit test -# run: pnpm --filter gui run coverage -# - name: lint -# run: pnpm -r lint -# build_svelte: -# needs: changes -# if: needs.changes.outputs.svelte == 'true' -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# - name: build tauri for Linux -# uses: docker://getneil/tea-builder:latest -# - uses: aws-actions/configure-aws-credentials@v1 -# with: -# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} -# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} -# aws-region: us-east-1 -# - name: sync web files into preview folder -# env: -# prefix: ${{ needs.changes.outputs.preview_folder }} -# run: | -# aws s3 sync ./modules/gui/build \ -# "s3://preview.gui.tea.xyz/$prefix" -# - name: Install package -# run: sudo apt-get install -y jq coreutils -# - name: setup preview -# id: preview_setup -# run: .github/create-invalidate-preview.sh ${{ needs.changes.outputs.preview_folder }} + - name: comment preview site + uses: mshick/add-pr-comment@v2 + with: + message-id: preview-comment-${{needs.changes.outputs.preview_folder}} + message: | + **preview is at**: + here + ```bash + https://${{steps.preview_setup.outputs.domain}} + ``` + copy-paste into a browser to view -# - name: comment preview site -# uses: mshick/add-pr-comment@v2 -# with: -# message-id: preview-comment-${{needs.changes.outputs.preview_folder}} -# message: | -# **preview is at**: -# here -# ```bash -# https://${{steps.preview_setup.outputs.domain}} -# ``` -# copy-paste into a browser to view + build_tauri: + needs: changes + if: needs.changes.outputs.tauri == 'true' + runs-on: ${{ matrix.platform.os }} + strategy: + matrix: + platform: + - 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 + # err: Package atk was not found in the pkg-config search path. + # requires atk >= 2.18 + # - os: [self-hosted, linux, ARM64] + # name: linux+aarch64 + container: ${{ matrix.platform.container }} + steps: + - uses: actions/checkout@v3 -# build_tauri: -# needs: changes -# if: needs.changes.outputs.tauri == 'true' -# runs-on: ${{ matrix.platform.os }} -# strategy: -# matrix: -# platform: -# - 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 -# # err: Package atk was not found in the pkg-config search path. -# # requires atk >= 2.18 -# # - os: [self-hosted, linux, ARM64] -# # name: linux+aarch64 -# container: ${{ matrix.platform.container }} -# steps: -# - uses: actions/checkout@v3 + - name: build tauri for MacOS + # uses: teaxyz/setup@v0 + if: startsWith(matrix.platform.name, 'darwin') + # FROM: https://tauri.app/v1/guides/distribution/sign-macos + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ENABLE_CODE_SIGNING: ${{ secrets.GUI_APPLE_CERTIFICATE }} + APPLE_CERTIFICATE: ${{ secrets.GUI_APPLE_CERTIFICATE }} + APPLE_CERTIFICATE_PASSWORD: ${{ secrets.GUI_APPLE_CERTIFICATE_PASSWORD }} + APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} + # TODO: uncomment once isolated m1 runner is setup with latest xcode + # only used for notarization + # APPLE_ID: ${{ secrets.APPLE_ID }} + # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} + run: | + sh <(curl https://tea.xyz) -ES xc build -# - name: build tauri for MacOS -# # uses: teaxyz/setup@v0 -# if: startsWith(matrix.platform.name, 'darwin') -# # FROM: https://tauri.app/v1/guides/distribution/sign-macos -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# ENABLE_CODE_SIGNING: ${{ secrets.GUI_APPLE_CERTIFICATE }} -# APPLE_CERTIFICATE: ${{ secrets.GUI_APPLE_CERTIFICATE }} -# APPLE_CERTIFICATE_PASSWORD: ${{ secrets.GUI_APPLE_CERTIFICATE_PASSWORD }} -# APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} -# # TODO: uncomment once isolated m1 runner is setup with latest xcode -# # only used for notarization -# # APPLE_ID: ${{ secrets.APPLE_ID }} -# # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} -# run: | -# sh <(curl https://tea.xyz) -ES xc build - -# - name: build tauri for Linux -# # uses: teaxyz/setup@v0 -# if: startsWith(matrix.platform.name, 'linux') -# # TODO: https://tauri.app/v1/guides/distribution/sign-linux -# uses: docker://getneil/tea-builder:latest + - name: build tauri for Linux + # uses: teaxyz/setup@v0 + if: startsWith(matrix.platform.name, 'linux') + # TODO: https://tauri.app/v1/guides/distribution/sign-linux + uses: docker://getneil/tea-builder:latest -# - name: build platform output -# id: build_platform -# env: -# platform: ${{ matrix.platform.name }} -# run: | -# EXTENSION=dmg -# BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") -# [[ $BUILD_PLATFORM = "x86-64" ]] && BUILD_PLATFORM="x64" || BUILD_PLATFORM=$BUILD_PLATFORM -# [[ $platform = "linux+x86-64" ]] && BUILD_PLATFORM="amd64" || BUILD_PLATFORM=$BUILD_PLATFORM -# [[ $platform = "linux+x86-64" ]] && EXTENSION="deb" -# echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT -# echo "extension=$EXTENSION" >> $GITHUB_OUTPUT + - name: build platform output + id: build_platform + env: + platform: ${{ matrix.platform.name }} + run: | + EXTENSION=dmg + BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") + [[ $BUILD_PLATFORM = "x86-64" ]] && BUILD_PLATFORM="x64" || BUILD_PLATFORM=$BUILD_PLATFORM + [[ $platform = "linux+x86-64" ]] && BUILD_PLATFORM="amd64" || BUILD_PLATFORM=$BUILD_PLATFORM + [[ $platform = "linux+x86-64" ]] && EXTENSION="deb" + echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT + echo "extension=$EXTENSION" >> $GITHUB_OUTPUT -# - name: zip .app for MacOS -# if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' -# run: | -# cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app + - name: zip .app for MacOS + if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' + run: | + cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app -# - uses: aws-actions/configure-aws-credentials@v1 -# with: -# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} -# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} -# aws-region: us-east-1 + - uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 -# - name: cp package images from prod to preview bucket -# env: -# prefix: ${{ needs.changes.outputs.preview_folder }} -# platform: ${{ steps.build_platform.outputs.build_platform }} -# extension: ${{ steps.build_platform.outputs.extension }} -# run: | -# aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ -# "s3://preview.gui.tea.xyz/$prefix/tea_$platform.$extension" + - name: cp package images from prod to preview bucket + env: + prefix: ${{ needs.changes.outputs.preview_folder }} + platform: ${{ steps.build_platform.outputs.build_platform }} + extension: ${{ steps.build_platform.outputs.extension }} + run: | + aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ + "s3://preview.gui.tea.xyz/$prefix/tea_$platform.$extension" -# - name: cp package zip for MacOS -# if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' -# env: -# prefix: ${{ needs.changes.outputs.preview_folder }} -# platform: ${{ steps.build_platform.outputs.build_platform }} -# run: | -# aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" + - name: cp package zip for MacOS + if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' + env: + prefix: ${{ needs.changes.outputs.preview_folder }} + platform: ${{ steps.build_platform.outputs.build_platform }} + run: | + aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" -# - name: comment install for Linux -# if: startsWith(matrix.platform.name, 'linux') -# uses: mshick/add-pr-comment@v2 -# with: -# message-id: ${{ matrix.platform.id }}-comment -# message: | -# **installer for Linux ${{ matrix.platform.name }} is at**: -# here + - name: comment install for Linux + if: startsWith(matrix.platform.name, 'linux') + uses: mshick/add-pr-comment@v2 + with: + message-id: ${{ matrix.platform.id }}-comment + message: | + **installer for Linux ${{ matrix.platform.name }} is at**: + here -# ```bash -# http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} -# ``` -# copy-paste into a browser to download + ```bash + http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} + ``` + copy-paste into a browser to download -# - name: comment install for MacOS -# if: startsWith(matrix.platform.name, 'darwin') -# uses: mshick/add-pr-comment@v2 -# with: -# message-id: ${{ matrix.platform.id }}-comment -# message: | -# **installers for MacOS ${{ matrix.platform.name }} is at**: -# .zip -# or -# .dmg + - name: comment install for MacOS + if: startsWith(matrix.platform.name, 'darwin') + uses: mshick/add-pr-comment@v2 + with: + message-id: ${{ matrix.platform.id }}-comment + message: | + **installers for MacOS ${{ matrix.platform.name }} is at**: + .zip + or + .dmg -# ```bash -# http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.zip -# http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.dmg -# ``` -# copy-paste into a browser to download \ No newline at end of file + ```bash + http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.zip + http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.dmg + ``` + copy-paste into a browser to download \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c59c43..fe8e9f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,8 +4,6 @@ on: push: branches: - main - - notorize - jobs: changes: @@ -66,6 +64,12 @@ jobs: - name: build tauri for MacOS if: startsWith(matrix.platform.name, 'darwin') run: tea -ES xc build + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ENABLE_CODE_SIGNING: ${{ secrets.GUI_APPLE_CERTIFICATE }} + APPLE_CERTIFICATE: ${{ secrets.GUI_APPLE_CERTIFICATE }} + APPLE_CERTIFICATE_PASSWORD: ${{ secrets.GUI_APPLE_CERTIFICATE_PASSWORD }} + APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} - name: build tauri for Linux if: startsWith(matrix.platform.name, 'linux') @@ -85,9 +89,25 @@ jobs: notorize_tauri: needs: [build_tauri] runs-on: macos-11 + strategy: + matrix: + platform: + - darwin+x86-64 + - darwin+aarch64 steps: - - run: > - true + - uses: actions/download-artifact@v3 + with: + name: ${{ matrix.platform }} + + - run: tar xzf artifacts.tgz + + - run: cd ./macos/ && zip -r tea.zip tea.app + + # Notarize. Can take up to 10 minutes (and fail) asynchronously + - run: xcrun altool --notarize-app --username "$APPLE_ID" --password "$APPLE_PASSWORD" --primary-bundle-id "com.tea.xyz" --file ./macos/tea.zip + env: + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} upload: needs: [build_tauri, notorize_tauri] @@ -148,11 +168,6 @@ jobs: echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - - name: zip .app for MacOS - if: startsWith(matrix.platform, 'darwin') - run: | - cd ./macos/ && zip -r tea.zip tea.app - # - name: cp package images from prod to gui bucket # env: # platform: ${{ steps.build_platform.outputs.build_platform }} From 42cf0fc54c37f12eefe447427a27ffa156560a8b Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 18:31:44 -0500 Subject: [PATCH 08/10] synchronize ci/main --- .github/workflows/ci.yml | 242 ++++++++++++++++++++++++------------- .github/workflows/main.yml | 79 ++++++------ 2 files changed, 199 insertions(+), 122 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 411a8d6..dae9504 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,99 +120,167 @@ jobs: # name: linux+aarch64 container: ${{ matrix.platform.container }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3 + - uses: teaxyz/setup@v0 + if: startsWith(matrix.platform.name, 'darwin') - - name: build tauri for MacOS - # uses: teaxyz/setup@v0 - if: startsWith(matrix.platform.name, 'darwin') - # FROM: https://tauri.app/v1/guides/distribution/sign-macos - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ENABLE_CODE_SIGNING: ${{ secrets.GUI_APPLE_CERTIFICATE }} - APPLE_CERTIFICATE: ${{ secrets.GUI_APPLE_CERTIFICATE }} - APPLE_CERTIFICATE_PASSWORD: ${{ secrets.GUI_APPLE_CERTIFICATE_PASSWORD }} - APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} - # TODO: uncomment once isolated m1 runner is setup with latest xcode - # only used for notarization - # APPLE_ID: ${{ secrets.APPLE_ID }} - # APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - run: | - sh <(curl https://tea.xyz) -ES xc build + - name: build tauri for MacOS + if: startsWith(matrix.platform.name, 'darwin') + # FROM: https://tauri.app/v1/guides/distribution/sign-macos + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ENABLE_CODE_SIGNING: ${{ secrets.GUI_APPLE_CERTIFICATE }} + APPLE_CERTIFICATE: ${{ secrets.GUI_APPLE_CERTIFICATE }} + APPLE_CERTIFICATE_PASSWORD: ${{ secrets.GUI_APPLE_CERTIFICATE_PASSWORD }} + APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} + run: tea -ES xc build - - name: build tauri for Linux - # uses: teaxyz/setup@v0 - if: startsWith(matrix.platform.name, 'linux') - # TODO: https://tauri.app/v1/guides/distribution/sign-linux - uses: docker://getneil/tea-builder:latest - - - name: build platform output - id: build_platform - env: - platform: ${{ matrix.platform.name }} - run: | - EXTENSION=dmg - BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") - [[ $BUILD_PLATFORM = "x86-64" ]] && BUILD_PLATFORM="x64" || BUILD_PLATFORM=$BUILD_PLATFORM - [[ $platform = "linux+x86-64" ]] && BUILD_PLATFORM="amd64" || BUILD_PLATFORM=$BUILD_PLATFORM - [[ $platform = "linux+x86-64" ]] && EXTENSION="deb" - echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT - echo "extension=$EXTENSION" >> $GITHUB_OUTPUT + - name: build tauri for Linux + if: startsWith(matrix.platform.name, 'linux') + # TODO: https://tauri.app/v1/guides/distribution/sign-linux + uses: docker://getneil/tea-builder:latest - - name: zip .app for MacOS - if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' - run: | - cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app + - run: > + tar -czvf artifacts.tgz + -C ./modules/gui/src-tauri/target/release/bundle . - - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 + - name: upload artifacts + uses: actions/upload-artifact@v3 + with: + name: ${{ matrix.platform.name }} + path: artifacts.tgz + if-no-files-found: error - - name: cp package images from prod to preview bucket - env: - prefix: ${{ needs.changes.outputs.preview_folder }} - platform: ${{ steps.build_platform.outputs.build_platform }} - extension: ${{ steps.build_platform.outputs.extension }} - run: | - aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ - "s3://preview.gui.tea.xyz/$prefix/tea_$platform.$extension" - - - name: cp package zip for MacOS - if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' - env: - prefix: ${{ needs.changes.outputs.preview_folder }} - platform: ${{ steps.build_platform.outputs.build_platform }} - run: | - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" + notorize_tauri: + needs: [build_tauri] + runs-on: macos-11 + strategy: + matrix: + platform: + - darwin+x86-64 + - darwin+aarch64 + steps: + - uses: actions/download-artifact@v3 + with: + name: ${{ matrix.platform }} - - name: comment install for Linux - if: startsWith(matrix.platform.name, 'linux') - uses: mshick/add-pr-comment@v2 - with: - message-id: ${{ matrix.platform.id }}-comment - message: | - **installer for Linux ${{ matrix.platform.name }} is at**: - here + - run: tar xzf artifacts.tgz - ```bash - http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} - ``` - copy-paste into a browser to download + - run: cd ./macos/ && zip -r tea.zip tea.app - - name: comment install for MacOS - if: startsWith(matrix.platform.name, 'darwin') - uses: mshick/add-pr-comment@v2 - with: - message-id: ${{ matrix.platform.id }}-comment - message: | - **installers for MacOS ${{ matrix.platform.name }} is at**: - .zip - or - .dmg + # Notarize. Can take up to 10 minutes (and fail) asynchronously + - run: xcrun altool --notarize-app --username "$APPLE_ID" --password "$APPLE_PASSWORD" --primary-bundle-id "com.tea.xyz" --file ./macos/tea.zip + env: + APPLE_ID: ${{ secrets.APPLE_ID }} + APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - ```bash - http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.zip - http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.dmg - ``` - copy-paste into a browser to download \ No newline at end of file + upload: + needs: [build_tauri, notorize_tauri] + runs-on: ubuntu-latest + strategy: + matrix: + platform: + - darwin+x86-64 + - linux+x86-64 + - darwin+aarch64 + # - linux+aarch64 + steps: + - uses: actions/download-artifact@v3 + with: + name: ${{ matrix.platform }} + + - run: tar xzf artifacts.tgz + + - name: build platform output + id: build_platform + env: + platform: ${{ matrix.platform }} + run: | + BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") + EXTENSION=dmg + case $platform in + "linux+x86-64") + BUILD_PLATFORM="amd64" + EXTENSION="deb" + ;; + "linux+aarch64") + BUILD_PLATFORM="aarch64" + EXTENSION="deb" + ;; + "darwin+aarch64") + BUILD_PLATFORM="aarch64" + EXTENSION="dmg" + ;; + "darwin+x86-64") + BUILD_PLATFORM="x64" + EXTENSION="dmg" + ;; + *) + echo "Unknown platform $platform" + exit 1 + ;; + esac + echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT + echo "extension=$EXTENSION" >> $GITHUB_OUTPUT + + - name: zip .app for MacOS + if: startsWith(matrix.platform, 'darwin+') + run: | + cd ./modules/gui/src-tauri/target/release/bundle/macos/ + zip -r tea.zip tea.app + + - uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 + + - name: cp package images from prod to preview bucket + env: + prefix: ${{ needs.changes.outputs.preview_folder }} + platform: ${{ steps.build_platform.outputs.build_platform }} + extension: ${{ steps.build_platform.outputs.extension }} + run: > + aws s3 cp + "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" + "s3://preview.gui.tea.xyz/$prefix/tea_$platform.$extension" + + - name: cp package zip for MacOS + if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' + env: + prefix: ${{ needs.changes.outputs.preview_folder }} + platform: ${{ steps.build_platform.outputs.build_platform }} + run: > + aws s3 cp + ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" + + - name: comment install for Linux + if: startsWith(matrix.platform.name, 'linux') + uses: mshick/add-pr-comment@v2 + with: + message-id: ${{ matrix.platform.id }}-comment + message: | + **installer for Linux ${{ matrix.platform.name }} is at**: + here + + ```bash + http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} + ``` + copy-paste into a browser to download + + - name: comment install for MacOS + if: startsWith(matrix.platform.name, 'darwin') + uses: mshick/add-pr-comment@v2 + with: + message-id: ${{ matrix.platform.id }}-comment + message: | + **installers for MacOS ${{ matrix.platform.name }} is at**: + .zip + or + .dmg + + ```bash + http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.zip + http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/tea_${{ steps.build_platform.outputs.build_platform }}.dmg + ``` + copy-paste into a browser to download \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe8e9f6..f55fffb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,8 +76,9 @@ jobs: # TODO: https://tauri.app/v1/guides/distribution/sign-linux uses: docker://getneil/tea-builder:latest - - run: | - tar -czvf artifacts.tgz -C ./modules/gui/src-tauri/target/release/bundle . + - run: > + tar -czvf artifacts.tgz + -C ./modules/gui/src-tauri/target/release/bundle . - name: upload artifacts uses: actions/upload-artifact@v3 @@ -168,38 +169,46 @@ jobs: echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - # - name: cp package images from prod to gui bucket - # env: - # platform: ${{ steps.build_platform.outputs.build_platform }} - # build_platform: ${{ matrix.platform }} - # extension: ${{steps.build_platform.outputs.extension}} - # run: | - # aws s3 cp "./$extension/tea_0.1.0_$platform.$extension" \ - # "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.$extension" + - name: zip .app for MacOS + if: startsWith(matrix.platform, 'darwin+') + run: | + cd ./modules/gui/src-tauri/target/release/bundle/macos/ + zip -r tea.zip tea.app - # - name: cp package zip for MacOS - # if: startsWith(matrix.platform, 'darwin') - # env: - # platform: ${{ steps.build_platform.outputs.build_platform }} - # build_platform: ${{ matrix.platform }} - # run: | - # aws s3 cp ./macos/tea.zip "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.zip" - # - uses: actions/setup-node@v3 - # with: - # node-version: 18 - # - name: Slack Notification - # run: ./.github/notify-slack.js - # env: - # SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - # PLATFORM: ${{ matrix.platform }} - # EXT: ${{ steps.build_platform.outputs.extension }} - # DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} + - name: cp package images from prod to gui bucket + env: + platform: ${{ steps.build_platform.outputs.build_platform }} + build_platform: ${{ matrix.platform }} + extension: ${{steps.build_platform.outputs.extension}} + run: > + aws s3 cp + "./$extension/tea_0.1.0_$platform.$extension" + "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.$extension" - # - name: Slack Notification for .app Mac - # run: ./.github/notify-slack.js - # if: startsWith(matrix.platform, 'darwin') - # env: - # SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - # PLATFORM: ${{ matrix.platform }} - # EXT: .zip(.app) - # DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.zip + - name: cp package zip for MacOS + if: startsWith(matrix.platform, 'darwin') + env: + platform: ${{ steps.build_platform.outputs.build_platform }} + build_platform: ${{ matrix.platform }} + run: > + aws s3 cp ./macos/tea.zip + "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.zip" + - uses: actions/setup-node@v3 + with: + node-version: 18 + - name: Slack Notification + run: ./.github/notify-slack.js + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + PLATFORM: ${{ matrix.platform }} + EXT: ${{ steps.build_platform.outputs.extension }} + DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} + + - name: Slack Notification for .app Mac + run: ./.github/notify-slack.js + if: startsWith(matrix.platform, 'darwin') + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} + PLATFORM: ${{ matrix.platform }} + EXT: .zip(.app) + DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.zip From b826016bdba66b34fa3c608abcd940164ca69309 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 18:37:13 -0500 Subject: [PATCH 09/10] string formats --- .github/workflows/ci.yml | 14 ++++++-------- .github/workflows/main.yml | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dae9504..bcc8693 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,9 +140,7 @@ jobs: # TODO: https://tauri.app/v1/guides/distribution/sign-linux uses: docker://getneil/tea-builder:latest - - run: > - tar -czvf artifacts.tgz - -C ./modules/gui/src-tauri/target/release/bundle . + - run: tar -czvf artifacts.tgz -C ./modules/gui/src-tauri/target/release/bundle . - name: upload artifacts uses: actions/upload-artifact@v3 @@ -240,9 +238,9 @@ jobs: prefix: ${{ needs.changes.outputs.preview_folder }} platform: ${{ steps.build_platform.outputs.build_platform }} extension: ${{ steps.build_platform.outputs.extension }} - run: > - aws s3 cp - "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" + run: | + aws s3 cp \ + "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ "s3://preview.gui.tea.xyz/$prefix/tea_$platform.$extension" - name: cp package zip for MacOS @@ -250,8 +248,8 @@ jobs: env: prefix: ${{ needs.changes.outputs.preview_folder }} platform: ${{ steps.build_platform.outputs.build_platform }} - run: > - aws s3 cp + run: | + aws s3 cp \ ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" - name: comment install for Linux diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f55fffb..d92340e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -76,9 +76,7 @@ jobs: # TODO: https://tauri.app/v1/guides/distribution/sign-linux uses: docker://getneil/tea-builder:latest - - run: > - tar -czvf artifacts.tgz - -C ./modules/gui/src-tauri/target/release/bundle . + - run: tar -czvf artifacts.tgz -C ./modules/gui/src-tauri/target/release/bundle . - name: upload artifacts uses: actions/upload-artifact@v3 @@ -180,9 +178,9 @@ jobs: platform: ${{ steps.build_platform.outputs.build_platform }} build_platform: ${{ matrix.platform }} extension: ${{steps.build_platform.outputs.extension}} - run: > - aws s3 cp - "./$extension/tea_0.1.0_$platform.$extension" + run: | + aws s3 cp \ + "./$extension/tea_0.1.0_$platform.$extension" \ "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.$extension" - name: cp package zip for MacOS @@ -190,8 +188,8 @@ jobs: env: platform: ${{ steps.build_platform.outputs.build_platform }} build_platform: ${{ matrix.platform }} - run: > - aws s3 cp ./macos/tea.zip + run: | + aws s3 cp ./macos/tea.zip \ "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.zip" - uses: actions/setup-node@v3 with: From c6ab5962ff51a22899a47f66a1b8e6f2d16f326e Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 20 Jan 2023 19:03:30 -0500 Subject: [PATCH 10/10] sanity --- .github/workflows/ci.yml | 30 +++++++++++++++--------------- .github/workflows/main.yml | 1 - 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcc8693..601c543 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,18 +107,14 @@ jobs: platform: - 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 # err: Package atk was not found in the pkg-config search path. # requires atk >= 2.18 # - os: [self-hosted, linux, ARM64] # name: linux+aarch64 - container: ${{ matrix.platform.container }} steps: - uses: actions/checkout@v3 - uses: teaxyz/setup@v0 @@ -178,21 +174,25 @@ jobs: strategy: matrix: platform: - - darwin+x86-64 - - linux+x86-64 - - darwin+aarch64 - # - linux+aarch64 + - name: darwin+x86-64 + id: mac_latest + - name: linux+x86-64 + id: linux + - name: darwin+aarch64 + id: mac_m1 + # - name: linux+aarch64 + # id: linux_arm64 steps: - uses: actions/download-artifact@v3 with: - name: ${{ matrix.platform }} + name: ${{ matrix.platform.name }} - run: tar xzf artifacts.tgz - name: build platform output id: build_platform env: - platform: ${{ matrix.platform }} + platform: ${{ matrix.platform.name }} run: | BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") EXTENSION=dmg @@ -222,9 +222,9 @@ jobs: echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - name: zip .app for MacOS - if: startsWith(matrix.platform, 'darwin+') + if: startsWith(matrix.platform.name, 'darwin+') run: | - cd ./modules/gui/src-tauri/target/release/bundle/macos/ + cd ./macos/ zip -r tea.zip tea.app - uses: aws-actions/configure-aws-credentials@v1 @@ -240,17 +240,17 @@ jobs: extension: ${{ steps.build_platform.outputs.extension }} run: | aws s3 cp \ - "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ + "./$extension/tea_0.1.0_$platform.$extension" \ "s3://preview.gui.tea.xyz/$prefix/tea_$platform.$extension" - name: cp package zip for MacOS - if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' + if: startsWith(matrix.platform.name, 'darwin') env: prefix: ${{ needs.changes.outputs.preview_folder }} platform: ${{ steps.build_platform.outputs.build_platform }} run: | aws s3 cp \ - ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" + ./macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" - name: comment install for Linux if: startsWith(matrix.platform.name, 'linux') diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d92340e..604c8d7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,7 +55,6 @@ jobs: name: darwin+aarch64 # - os: [self-hosted, linux, ARM64] # name: linux+aarch64 - container: ${{ matrix.platform.container }} steps: - uses: actions/checkout@v3 - uses: teaxyz/setup@v0