From 3e70e8c22c710bc11f2afc32394cab967949a6c2 Mon Sep 17 00:00:00 2001 From: neil molina Date: Mon, 26 Jun 2023 14:24:41 +0800 Subject: [PATCH 1/2] use webp images that are auto-generated --- .github/get-packages-data.js | 24 +++++++++++++++++++++ .github/workflows/cd.yml | 2 +- .github/workflows/staging.yml | 2 +- src/layouts/partials/package-thumbnail.html | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .github/get-packages-data.js diff --git a/.github/get-packages-data.js b/.github/get-packages-data.js new file mode 100644 index 0000000..5cde315 --- /dev/null +++ b/.github/get-packages-data.js @@ -0,0 +1,24 @@ +const fs = require("fs"); +const packagesURL = "https://app.tea.xyz/v1/packages"; + +async function main() { + const response = await fetch(packagesURL); + const packagesRaw = await response.json(); + const packages = packagesRaw.map((pkg) => ({ + slug: pkg.slug, + homepage: pkg.homepage || pkg.github_url, + name: pkg.name, + full_name: pkg.full_name, + maintainer: pkg.maintainer, + created: pkg.created_at, + desc: pkg.description.replace(/\\/g, "\\\\"), + short_description: (pkg.short_description || pkg.description).replace(/\\/g, "\\\\"), + thumb_image_url: pkg.image_added_at ? `https://gui.tea.xyz/prod/${pkg.full_name}/512x512.webp` : "", + keywords: pkg.keywords, + dl_count: pkg.installs || 0, + installs: pkg.installs || 0, + })); + await fs.writeFileSync("./src/data/packages.json", JSON.stringify(packages, null, 2)); +} + +main(); \ No newline at end of file diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 40d2137..5a64b59 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -27,7 +27,7 @@ jobs: - name: add packages data run: | rm ./src/data/packages.json - curl https://gui.tea.xyz/packages.json -H "Accept: application/json" >> ./src/data/packages.json + node .github/get-packages-data.js - name: Create Package Detail Pages from packages.json uses: getneil/jq-action@v1 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index dad7485..324cd6b 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -38,7 +38,7 @@ jobs: - name: add packages data run: | rm ./src/data/packages.json - curl https://gui.tea.xyz/packages.json -H "Accept: application/json" >> ./src/data/packages.json + node .github/get-packages-data.js - name: Create Package Detail Pages from packages.json uses: getneil/jq-action@v1 diff --git a/src/layouts/partials/package-thumbnail.html b/src/layouts/partials/package-thumbnail.html index 076bc00..4ba3fce 100644 --- a/src/layouts/partials/package-thumbnail.html +++ b/src/layouts/partials/package-thumbnail.html @@ -1,4 +1,4 @@ -
+
From 31199c4f9de732f43a24e6464fcb876b88f4db27 Mon Sep 17 00:00:00 2001 From: neil molina Date: Mon, 26 Jun 2023 14:33:07 +0800 Subject: [PATCH 2/2] remove unused steps --- .github/workflows/staging.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 324cd6b..80a523e 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -56,12 +56,6 @@ jobs: # env: # GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - # update packages json data and rebuild again - - name: make images relative path to preview site - uses: getneil/jq-action@v1 - with: - cmd: '.github/sync-thumb-images.sh src/data/packages.json' - # intentional to rebuild packages again with relative image data # the first one to test it against prod resources via lychee - run: tea -E just ci @@ -90,14 +84,6 @@ jobs: BUCKET=$(aws s3 ls | grep $(echo teaxyz-pr-$GITHUB_REF_SLUG_URL | sed "s/-merge//") | grep -o '[^ ]*$') echo "bucket=$BUCKET" >> $GITHUB_OUTPUT - - name: cp package images from prod to preview bucket - run: | - aws s3 cp s3://www.tea.xyz/Images/packages \ - s3://$NEW_BUCKET/Images/packages \ - --recursive - env: - NEW_BUCKET: ${{ steps.DEPLOY_BUCKET.outputs.bucket }} - - name: Seal Deployment uses: bobheadxi/deployments@v1 if: always()