From 7b2bf08b8f47e0340a40aad71b9e89df3c0f5fa8 Mon Sep 17 00:00:00 2001 From: V Date: Thu, 1 Jun 2023 22:49:15 +0200 Subject: [PATCH] [skip ci] ci: fix inconsistent formatting --- .github/workflows/build.yml | 38 +++++++++---------- .github/workflows/publish.yml | 46 +++++++++++------------ .github/workflows/reportBrokenPlugins.yml | 36 +++++++++--------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46645ad8..cc276044 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,37 +42,37 @@ jobs: - name: Clean up obsolete files run: | - rm -rf dist/*-unpacked Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map + rm -rf dist/*-unpacked Vencord.user.css vencordDesktopRenderer.css vencordDesktopRenderer.css.map - name: Get some values needed for the release id: release_values run: | - echo "release_tag=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + echo "release_tag=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - name: Upload DevBuild as release run: | - gh release upload devbuild --clobber dist/* - gh release edit devbuild --title "DevBuild $RELEASE_TAG" + gh release upload devbuild --clobber dist/* + gh release edit devbuild --title "DevBuild $RELEASE_TAG" env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_TAG: ${{ env.release_tag }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RELEASE_TAG: ${{ env.release_tag }} - name: Upload DevBuild to builds repo run: | - git config --global user.name "$USERNAME" - git config --global user.email actions@github.com + git config --global user.name "$USERNAME" + git config --global user.email actions@github.com - git clone https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git upload - cd upload + git clone https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git upload + cd upload - GLOBIGNORE=.git:.gitignore:README.md:LICENSE - rm -rf * - cp -r ../dist/* . + GLOBIGNORE=.git:.gitignore:README.md:LICENSE + rm -rf * + cp -r ../dist/* . - git add -A - git commit -m "Builds for https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA" - git push --force https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git + git add -A + git commit -m "Builds for https://github.com/$GITHUB_REPOSITORY/commit/$GITHUB_SHA" + git push --force https://$USERNAME:$API_TOKEN@github.com/$GH_REPO.git env: - API_TOKEN: ${{ secrets.BUILDS_TOKEN }} - GH_REPO: Vencord/builds - USERNAME: GitHub-Actions + API_TOKEN: ${{ secrets.BUILDS_TOKEN }} + GH_REPO: Vencord/builds + USERNAME: GitHub-Actions diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f9ddf608..0d0e7e4c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,11 +13,11 @@ jobs: - name: check that tag matches package.json version run: | - pkg_version="v$(jq -r .version < package.json)" - if [[ "${{ github.ref_name }}" != "$pkg_version" ]]; then - echo "Tag ${{ github.ref_name }} does not match package.json version $pkg_version" >&2 - exit 1 - fi + pkg_version="v$(jq -r .version < package.json)" + if [[ "${{ github.ref_name }}" != "$pkg_version" ]]; then + echo "Tag ${{ github.ref_name }} does not match package.json version $pkg_version" >&2 + exit 1 + fi - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json @@ -35,26 +35,26 @@ jobs: - name: Publish extension run: | - # Do not fail so that even if chrome fails, firefox gets a shot. But also store exit code to fail workflow later - EXIT_CODE=0 + # Do not fail so that even if chrome fails, firefox gets a shot. But also store exit code to fail workflow later + EXIT_CODE=0 - # Chrome - cd dist/chromium-unpacked - pnpx chrome-webstore-upload-cli@2.1.0 upload --auto-publish || EXIT_CODE=$? + # Chrome + cd dist/chromium-unpacked + pnpx chrome-webstore-upload-cli@2.1.0 upload --auto-publish || EXIT_CODE=$? - # Firefox - cd ../firefox-unpacked - npm i -g web-ext@7.4.0 web-ext-submit@7.4.0 - web-ext-submit || EXIT_CODE=$? + # Firefox + cd ../firefox-unpacked + npm i -g web-ext@7.4.0 web-ext-submit@7.4.0 + web-ext-submit || EXIT_CODE=$? - exit $EXIT_CODE + exit $EXIT_CODE env: - # Chrome - EXTENSION_ID: ${{ secrets.CHROME_EXTENSION_ID }} - CLIENT_ID: ${{ secrets.CHROME_CLIENT_ID }} - CLIENT_SECRET: ${{ secrets.CHROME_CLIENT_SECRET }} - REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }} + # Chrome + EXTENSION_ID: ${{ secrets.CHROME_EXTENSION_ID }} + CLIENT_ID: ${{ secrets.CHROME_CLIENT_ID }} + CLIENT_SECRET: ${{ secrets.CHROME_CLIENT_SECRET }} + REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }} - # Firefox - WEB_EXT_API_KEY: ${{ secrets.WEBEXT_USER }} - WEB_EXT_API_SECRET: ${{ secrets.WEBEXT_SECRET }} + # Firefox + WEB_EXT_API_KEY: ${{ secrets.WEBEXT_USER }} + WEB_EXT_API_SECRET: ${{ secrets.WEBEXT_SECRET }} diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml index 6dcc09d3..58c4bcee 100644 --- a/.github/workflows/reportBrokenPlugins.yml +++ b/.github/workflows/reportBrokenPlugins.yml @@ -2,8 +2,8 @@ name: Test Patches on: workflow_dispatch: schedule: - # Every day at midnight - - cron: 0 0 * * * + # Every day at midnight + - cron: 0 0 * * * jobs: TestPlugins: @@ -22,10 +22,10 @@ jobs: - name: Install dependencies run: | - pnpm install --frozen-lockfile - pnpm add puppeteer + pnpm install --frozen-lockfile + pnpm add puppeteer - sudo apt-get install -y chromium-browser + sudo apt-get install -y chromium-browser - name: Build web run: pnpm buildWeb --standalone @@ -33,25 +33,25 @@ jobs: - name: Create Report timeout-minutes: 10 run: | - export PATH="$PWD/node_modules/.bin:$PATH" - export CHROMIUM_BIN=$(which chromium-browser) + export PATH="$PWD/node_modules/.bin:$PATH" + export CHROMIUM_BIN=$(which chromium-browser) - esbuild scripts/generateReport.ts > dist/report.mjs - node dist/report.mjs >> $GITHUB_STEP_SUMMARY + esbuild scripts/generateReport.ts > dist/report.mjs + node dist/report.mjs >> $GITHUB_STEP_SUMMARY env: - DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} - name: Create Report (Canary) timeout-minutes: 10 if: success() || failure() # even run if previous one failed run: | - export PATH="$PWD/node_modules/.bin:$PATH" - export CHROMIUM_BIN=$(which chromium-browser) - export USE_CANARY=true + export PATH="$PWD/node_modules/.bin:$PATH" + export CHROMIUM_BIN=$(which chromium-browser) + export USE_CANARY=true - esbuild scripts/generateReport.ts > dist/report.mjs - node dist/report.mjs >> $GITHUB_STEP_SUMMARY + esbuild scripts/generateReport.ts > dist/report.mjs + node dist/report.mjs >> $GITHUB_STEP_SUMMARY env: - DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} - DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }} + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}