Merge pull request #98 from teaxyz/change-packages-folders

#92 change /packages/ to /modules/
This commit is contained in:
Neil 2022-12-21 10:46:49 +08:00 committed by GitHub
commit e68a7a627a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
173 changed files with 77 additions and 282 deletions

View file

@ -28,7 +28,7 @@ else
pnpm build:gui -b dmg pnpm build:gui -b dmg
echo "uploading to s3" echo "uploading to s3"
build_path="$PWD/packages/gui/src-tauri/target/release/bundle/dmg/gui_0.1.0_aarch64.dmg" build_path="$PWD/modules/gui/src-tauri/target/release/bundle/dmg/gui_0.1.0_aarch64.dmg"
tag_path="s3://preview.gui.tea.xyz/release/tea_gui_$tag.$ARM_CPU.dmg" tag_path="s3://preview.gui.tea.xyz/release/tea_gui_$tag.$ARM_CPU.dmg"
latest_path="s3://preview.gui.tea.xyz/release/tea_gui_latest.$ARM_CPU.dmg" latest_path="s3://preview.gui.tea.xyz/release/tea_gui_latest.$ARM_CPU.dmg"
aws s3 cp $build_path $tag_path aws s3 cp $build_path $tag_path

View file

@ -16,16 +16,16 @@ jobs:
with: with:
filters: | filters: |
src: src:
- 'packages/gui/src/**' - 'modules/gui/src/**'
- 'packages/ui/**' - 'modules/ui/**'
- uses: dorny/paths-filter@v2 - uses: dorny/paths-filter@v2
id: tauri id: tauri
with: with:
filters: | filters: |
src: src:
- 'packages/gui/src-tauri/**' - 'modules/gui/src-tauri/**'
- 'packages/gui/src/**' - 'modules/gui/src/**'
- 'packages/ui/src/**' - 'modules/ui/src/**'
- name: get s3 preview folder - name: get s3 preview folder
id: preview id: preview
run: echo "folder=${{ github.event.number }}-merge" >> $GITHUB_OUTPUT run: echo "folder=${{ github.event.number }}-merge" >> $GITHUB_OUTPUT
@ -94,7 +94,7 @@ jobs:
env: env:
prefix: ${{ needs.changes.outputs.preview_folder }} prefix: ${{ needs.changes.outputs.preview_folder }}
run: | run: |
aws s3 sync ./packages/gui/build \ aws s3 sync ./modules/gui/build \
"s3://preview.gui.tea.xyz/$prefix" "s3://preview.gui.tea.xyz/$prefix"
- name: Install package - name: Install package
run: sudo apt-get install -y jq coreutils run: sudo apt-get install -y jq coreutils
@ -157,7 +157,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: | path: |
./packages/gui/src-tauri/target ./modules/gui/src-tauri/target
key: ${{ matrix.platform }}-build-target key: ${{ matrix.platform }}-build-target
restore-keys: | restore-keys: |
${{ matrix.platform }}-build-target ${{ matrix.platform }}-build-target
@ -176,7 +176,7 @@ jobs:
env: env:
prefix: ${{ needs.changes.outputs.preview_folder }} prefix: ${{ needs.changes.outputs.preview_folder }}
run: | run: |
aws s3 cp ./packages/gui/src-tauri/target/release/bundle/dmg/gui_0.1.0_x64.dmg \ aws s3 cp ./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_x64.dmg \
"s3://preview.gui.tea.xyz/$prefix/gui.dmg" "s3://preview.gui.tea.xyz/$prefix/gui.dmg"
- name: ubuntu cp package images from prod to preview bucket - name: ubuntu cp package images from prod to preview bucket
@ -184,7 +184,7 @@ jobs:
env: env:
prefix: ${{ needs.changes.outputs.preview_folder }} prefix: ${{ needs.changes.outputs.preview_folder }}
run: | run: |
aws s3 cp ./packages/gui/src-tauri/target/release/bundle/deb/gui_0.1.0_amd64.deb \ aws s3 cp ./modules/gui/src-tauri/target/release/bundle/deb/tea_0.1.0_amd64.deb \
"s3://preview.gui.tea.xyz/$prefix/gui.deb" "s3://preview.gui.tea.xyz/$prefix/gui.deb"
- name: comment install ubuntu - name: comment install ubuntu

View file

@ -19,14 +19,14 @@ jobs:
with: with:
filters: | filters: |
src: src:
- 'packages/gui/src/**' - 'modules/gui/src/**'
- 'packages/ui/**' - 'modules/ui/**'
- uses: dorny/paths-filter@v2 - uses: dorny/paths-filter@v2
id: tauri id: tauri
with: with:
filters: | filters: |
src: src:
- 'packages/gui/src-tauri/**' - 'modules/gui/src-tauri/**'
build_svelte: build_svelte:
needs: changes needs: changes
if: needs.changes.outputs.svelte == 'true' if: needs.changes.outputs.svelte == 'true'
@ -99,7 +99,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: | path: |
./packages/gui/src-tauri/target ./modules/gui/src-tauri/target
key: ${{ matrix.platform }}-build-target-prod key: ${{ matrix.platform }}-build-target-prod
restore-keys: | restore-keys: |
${{ matrix.platform }}-build-target-prod ${{ matrix.platform }}-build-target-prod
@ -118,12 +118,12 @@ jobs:
- name: mac-os cp package images from prod to gui bucket - name: mac-os cp package images from prod to gui bucket
if: matrix.platform == 'macos-latest' if: matrix.platform == 'macos-latest'
run: | run: |
aws s3 cp ./packages/gui/src-tauri/target/release/bundle/dmg/gui_0.1.0_x64.dmg \ aws s3 cp ./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_x64.dmg \
s3://preview.gui.tea.xyz/release/gui_${{ steps.date.outputs.unix_seconds }}.dmg s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}.dmg
- name: ubuntu cp package images from prod to gui bucket - name: ubuntu cp package images from prod to gui bucket
if: matrix.platform == 'ubuntu-latest' if: matrix.platform == 'ubuntu-latest'
run: | run: |
aws s3 cp ./packages/gui/src-tauri/target/release/bundle/deb/gui_0.1.0_amd64.deb \ aws s3 cp ./modules/gui/src-tauri/target/release/bundle/deb/tea_0.1.0_amd64.deb \
s3://preview.gui.tea.xyz/release/gui_${{ steps.date.outputs.unix_seconds }}.deb s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}.deb

View file

@ -46,7 +46,7 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: | path: |
./packages/gui/src-tauri/target ./modules/gui/src-tauri/target
key: ${{ matrix.platform }}-build-target-prod key: ${{ matrix.platform }}-build-target-prod
restore-keys: | restore-keys: |
${{ matrix.platform }}-build-target-prod ${{ matrix.platform }}-build-target-prod
@ -70,14 +70,14 @@ jobs:
- name: UBUNTU publish release - name: UBUNTU publish release
if: matrix.platform == 'ubuntu-latest' if: matrix.platform == 'ubuntu-latest'
run: | run: |
aws s3 cp ./packages/gui/src-tauri/target/release/bundle/deb/gui_0.1.0_amd64.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_latest.${{matrix.platform}}.deb s3://preview.gui.tea.xyz/release/tea_gui_latest.${{matrix.platform}}.deb
aws s3 cp ./packages/gui/src-tauri/target/release/bundle/deb/gui_0.1.0_amd64.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 s3://preview.gui.tea.xyz/release/tea_gui_${{steps.tag.outputs.tag}}.${{matrix.platform}}.deb
- name: MAC INTEL publish release - name: MAC INTEL publish release
if: matrix.platform == 'macos-latest' if: matrix.platform == 'macos-latest'
run: | run: |
aws s3 cp ./packages/gui/src-tauri/target/release/bundle/dmg/gui_0.1.0_x64.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_latest.${{matrix.platform}}.dmg s3://preview.gui.tea.xyz/release/tea_gui_latest.${{matrix.platform}}.dmg
aws s3 cp ./packages/gui/src-tauri/target/release/bundle/dmg/gui_0.1.0_x64.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 s3://preview.gui.tea.xyz/release/tea_gui_${{steps.tag.outputs.tag}}.${{matrix.platform}}.dmg

View file

@ -49,5 +49,5 @@ $ AWS_PROFILE=tea/or/etc pnpm release
Refer to each package README.md for instructions on how to setup and contribue to them: Refer to each package README.md for instructions on how to setup and contribue to them:
* [tea/gui](./packages/gui/README.md) * [tea/gui](./modules/gui/README.md)
* [tea/ui](./packages/ui/README.md) * [tea/ui](./modules/ui/README.md)

View file

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View file

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View file

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

View file

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View file

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View file

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View file

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

View file

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View file

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View file

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View file

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

View file

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View file

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 164 KiB

View file

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View file

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View file

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

Before

Width:  |  Height:  |  Size: 764 KiB

After

Width:  |  Height:  |  Size: 764 KiB

View file

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

View file

Before

Width:  |  Height:  |  Size: 176 B

After

Width:  |  Height:  |  Size: 176 B

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View file

Before

Width:  |  Height:  |  Size: 137 B

After

Width:  |  Height:  |  Size: 137 B

View file

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Some files were not shown because too many files have changed in this diff Show more