From 928192a13c559ac693c420f3ff8e6a99714a3c1d Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 27 Dec 2022 12:11:36 +0800 Subject: [PATCH 1/3] #18 update release --- .github/workflows/release.yml | 61 ++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3180c21..9d19cf2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,12 +5,19 @@ on: jobs: build_release_tauri: + runs-on: ${{ matrix.platform.os }} strategy: - fail-fast: false matrix: - platform: [macos-latest, ubuntu-latest] - - runs-on: ${{ matrix.platform }} + platform: + - os: macos-11 + name: darwin+x86-64 + - os: ubuntu-latest + name: linux+x86-64 + - os: [self-hosted, macOS, ARM64] + name: darwin+aarch64 + # - os: [self-hosted, linux, ARM64] + # name: linux+aarch64 + container: ${{ matrix.platform.container }} steps: - uses: actions/checkout@v2 @@ -27,15 +34,27 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable + - name: build platform output + id: build_platform + env: + platform: ${{ matrix.platform.name }} + 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" + echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT + echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - uses: Swatinem/rust-cache@v2 with: # The prefix cache key, this can be changed to start a new cache manually. # default: "v0-rust" - prefix-key: ${{ matrix.platform }} + prefix-key: ${{ matrix.platform.name }} shared-key: prod cache-targets: false - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-latest' + if: matrix.platform.name == 'linux+x86-64' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf @@ -47,9 +66,9 @@ jobs: with: path: | ./modules/gui/src-tauri/target - key: ${{ matrix.platform }}-build-target-prod + key: ${{ matrix.platform.name }}-build-target-prod restore-keys: | - ${{ matrix.platform }}-build-target-prod + ${{ matrix.platform.name }}-build-target-prod - name: test build tauri run: pnpm --filter gui tauri build @@ -67,24 +86,22 @@ jobs: - name: Set tag id: tag run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - - name: UBUNTU publish release - if: matrix.platform == 'ubuntu-latest' + + - name: publish release + env: + platform: ${{ steps.build_platform.outputs.build_platform }} + extension: ${{ steps.build_platform.outputs.extension }} + tag: ${{ steps.tag.outputs.tag }} run: | - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/deb/tea_0.1.0_amd64.deb \ - s3://preview.gui.tea.xyz/release/tea_gui_latest.${{matrix.platform}}.deb - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/deb/tea_0.1.0_amd64.deb \ - s3://preview.gui.tea.xyz/release/tea_gui_${{steps.tag.outputs.tag}}.${{matrix.platform}}.deb - - name: MAC INTEL publish release - if: matrix.platform == 'macos-latest' - run: | - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_x64.dmg \ - s3://preview.gui.tea.xyz/release/tea_gui_latest.${{matrix.platform}}.dmg - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_x64.dmg \ - s3://preview.gui.tea.xyz/release/tea_gui_${{steps.tag.outputs.tag}}.${{matrix.platform}}.dmg + aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ + "s3://preview.gui.tea.xyz/release/tea_gui_latest_$platform.$extension" + aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ + "s3://preview.gui.tea.xyz/release/tea_gui_$tag_$platform.$extension" + - name: Slack Notification run: ./.github/notify-slack.js env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} PLATFORM: ${{ matrix.platform }} VERSION: ${{steps.tag.outputs.tag}} - DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_gui_${{steps.tag.outputs.tag}}.${{matrix.platform}}.${{ matrix.platform == 'ubuntu-latest' && 'deb' || 'dmg'}} + DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_gui_${{steps.tag.outputs.tag}}_${{steps.build_platform.outputs.build_platform}}.${{ steps.build_platform.outputs.extension }} From e3002a77c9fa99a8e571c0ca93bda109fa53be6b Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 27 Dec 2022 12:21:19 +0800 Subject: [PATCH 2/3] fix --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d19cf2..e61e619 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -102,6 +102,6 @@ jobs: run: ./.github/notify-slack.js env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - PLATFORM: ${{ matrix.platform }} + PLATFORM: ${{ matrix.platform.name }} VERSION: ${{steps.tag.outputs.tag}} DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_gui_${{steps.tag.outputs.tag}}_${{steps.build_platform.outputs.build_platform}}.${{ steps.build_platform.outputs.extension }} From 40c60a5f748b6160c0dfd3025c1c805e9f22f11b Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 27 Dec 2022 12:52:15 +0800 Subject: [PATCH 3/3] #106 move specialized endpont usage into centralized posts store --- .../EssentialWorkshops/EssentialWorkshops.svelte | 7 ++----- .../FeaturedCourses/FeaturedCourses.svelte | 16 ++++++++++------ modules/gui/src/components/News/News.svelte | 7 ++----- modules/gui/src/libs/stores.ts | 6 ++++++ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/modules/gui/src/components/EssentialWorkshops/EssentialWorkshops.svelte b/modules/gui/src/components/EssentialWorkshops/EssentialWorkshops.svelte index d559d35..1d64133 100644 --- a/modules/gui/src/components/EssentialWorkshops/EssentialWorkshops.svelte +++ b/modules/gui/src/components/EssentialWorkshops/EssentialWorkshops.svelte @@ -1,17 +1,14 @@ diff --git a/modules/gui/src/components/FeaturedCourses/FeaturedCourses.svelte b/modules/gui/src/components/FeaturedCourses/FeaturedCourses.svelte index 7e76fe8..68ffc6e 100644 --- a/modules/gui/src/components/FeaturedCourses/FeaturedCourses.svelte +++ b/modules/gui/src/components/FeaturedCourses/FeaturedCourses.svelte @@ -1,17 +1,21 @@ diff --git a/modules/gui/src/components/News/News.svelte b/modules/gui/src/components/News/News.svelte index 800aa9f..7b24eed 100644 --- a/modules/gui/src/components/News/News.svelte +++ b/modules/gui/src/components/News/News.svelte @@ -1,17 +1,14 @@ diff --git a/modules/gui/src/libs/stores.ts b/modules/gui/src/libs/stores.ts index 4a23a6b..acedd96 100644 --- a/modules/gui/src/libs/stores.ts +++ b/modules/gui/src/libs/stores.ts @@ -113,6 +113,12 @@ function initPosts() { const res = postsIndex.search(term, { limit }); const matchingPosts: AirtablePost[] = res.map((v) => v.item); return matchingPosts; + }, + subscribeByTag: (tag: string, cb: (posts: AirtablePost[]) => void) => { + subscribe((newPosts: AirtablePost[]) => { + const filteredPosts = newPosts.filter((post) => post.tags.includes(tag)); + cb(filteredPosts); + }); } }; }