From dff1a612e5580d07688f0c77245c42310ba331a1 Mon Sep 17 00:00:00 2001 From: sliptype Date: Fri, 19 Apr 2024 16:45:08 -0500 Subject: [PATCH 1/6] Log stuff --- .github/workflows/publish-packages.yml | 2 +- scripts/version-packages.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 6359d7c3482..72fe033002b 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -3,7 +3,7 @@ name: Publish Packages on: push: branches: - - main + - sk-fix-package-version concurrency: ${{ github.workflow }}-${{ github.ref }} diff --git a/scripts/version-packages.sh b/scripts/version-packages.sh index 8ff1034b896..fb91a4333d9 100644 --- a/scripts/version-packages.sh +++ b/scripts/version-packages.sh @@ -3,7 +3,9 @@ set -e +echo "Updating package versions..." npx changeset version # Update package-lock.json +echo "Updating package-lock.json..." npm install --package-lock-only \ No newline at end of file From cee07c5b3088153bff4356e3e9114faca5ecc0d6 Mon Sep 17 00:00:00 2001 From: sliptype Date: Fri, 19 Apr 2024 16:46:53 -0500 Subject: [PATCH 2/6] Enable --- .github/workflows/publish-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 72fe033002b..921aafbbc85 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -31,7 +31,7 @@ jobs: publish-packages: name: Publish Packages to NPM needs: changes - if: ${{ needs.changes.outputs.public-packages == 'true' }} + # if: ${{ needs.changes.outputs.public-packages == 'true' }} runs-on: ubuntu-latest steps: - name: Checkout Repo From f3419f20f55ef33156c306d8cbe31b75067e6e3a Mon Sep 17 00:00:00 2001 From: sliptype Date: Fri, 19 Apr 2024 17:06:45 -0500 Subject: [PATCH 3/6] Fix script --- scripts/publish-packages.sh | 2 +- scripts/version-packages.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/publish-packages.sh b/scripts/publish-packages.sh index fe480f613e9..2183abc92c5 100644 --- a/scripts/publish-packages.sh +++ b/scripts/publish-packages.sh @@ -16,4 +16,4 @@ npx turbo run build lint typecheck test \ --filter=@audius/sdk \ --filter=@audius/spl \ -npx changeset publish \ No newline at end of file +npm run changeset publish \ No newline at end of file diff --git a/scripts/version-packages.sh b/scripts/version-packages.sh index fb91a4333d9..1e3f18d56c4 100644 --- a/scripts/version-packages.sh +++ b/scripts/version-packages.sh @@ -4,7 +4,7 @@ set -e echo "Updating package versions..." -npx changeset version +npm run changeset version # Update package-lock.json echo "Updating package-lock.json..." From 5fca42f735df495731043548077fe76737dcae76 Mon Sep 17 00:00:00 2001 From: sliptype Date: Fri, 19 Apr 2024 17:16:33 -0500 Subject: [PATCH 4/6] Install root deps --- scripts/publish-packages.sh | 6 +++++- scripts/version-packages.sh | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/publish-packages.sh b/scripts/publish-packages.sh index 2183abc92c5..22871d9cb23 100644 --- a/scripts/publish-packages.sh +++ b/scripts/publish-packages.sh @@ -3,10 +3,13 @@ set -e +echo "Installing packages..." npm i +echo "Installing playwrigth..." npx playwright install +echo "Running build, lint, typecheck, and test..." # Ensure that all public packages are in this list, # otherwise they won't get built/linted/tested before being published npx turbo run build lint typecheck test \ @@ -16,4 +19,5 @@ npx turbo run build lint typecheck test \ --filter=@audius/sdk \ --filter=@audius/spl \ -npm run changeset publish \ No newline at end of file +echo "Publishing packages..." +npx changeset publish \ No newline at end of file diff --git a/scripts/version-packages.sh b/scripts/version-packages.sh index 1e3f18d56c4..bbd8ad9f14c 100644 --- a/scripts/version-packages.sh +++ b/scripts/version-packages.sh @@ -3,8 +3,11 @@ set -e +echo "Installing root packages..." +npm i --workspaces=false + echo "Updating package versions..." -npm run changeset version +npx changeset version # Update package-lock.json echo "Updating package-lock.json..." From bb2b572e1ee1da82db7e801d9a36a9aa1a79e6a0 Mon Sep 17 00:00:00 2001 From: sliptype Date: Fri, 19 Apr 2024 18:04:23 -0500 Subject: [PATCH 5/6] Improve installation --- .github/workflows/publish-packages.yml | 11 +++++------ scripts/publish-packages.sh | 3 --- scripts/version-packages.sh | 3 --- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 921aafbbc85..096795325e1 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -40,15 +40,14 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 18 - cache: 'npm' - cache-dependency-path: | - package-lock.json - packages/*/patches/*.patch - uses: actions/cache@v3 with: - path: '~/.npm' - key: ${{ runner.os }}-${{ matrix.node-version }}-npmcache-${{ hashFiles('package-lock.json') }}-${{ hashFiles('packages/*/patches/*.patch') }} + path: '**/node_modules' + key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}-${{ hashFiles('packages/*/patches/*.patch') }} + + - name: Install Dependencies + run: npm i - name: Update .npmrc run: | diff --git a/scripts/publish-packages.sh b/scripts/publish-packages.sh index 22871d9cb23..65b40db316b 100644 --- a/scripts/publish-packages.sh +++ b/scripts/publish-packages.sh @@ -3,9 +3,6 @@ set -e -echo "Installing packages..." -npm i - echo "Installing playwrigth..." npx playwright install diff --git a/scripts/version-packages.sh b/scripts/version-packages.sh index bbd8ad9f14c..fb91a4333d9 100644 --- a/scripts/version-packages.sh +++ b/scripts/version-packages.sh @@ -3,9 +3,6 @@ set -e -echo "Installing root packages..." -npm i --workspaces=false - echo "Updating package versions..." npx changeset version From a577c963d62ebba2c43322fdc803218d4007061f Mon Sep 17 00:00:00 2001 From: sliptype Date: Fri, 19 Apr 2024 18:15:23 -0500 Subject: [PATCH 6/6] Remove test code --- .github/workflows/publish-packages.yml | 4 ++-- scripts/publish-packages.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 096795325e1..b7db74fb67c 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -3,7 +3,7 @@ name: Publish Packages on: push: branches: - - sk-fix-package-version + - main concurrency: ${{ github.workflow }}-${{ github.ref }} @@ -31,7 +31,7 @@ jobs: publish-packages: name: Publish Packages to NPM needs: changes - # if: ${{ needs.changes.outputs.public-packages == 'true' }} + if: ${{ needs.changes.outputs.public-packages == 'true' }} runs-on: ubuntu-latest steps: - name: Checkout Repo diff --git a/scripts/publish-packages.sh b/scripts/publish-packages.sh index 65b40db316b..009ccfb65c8 100644 --- a/scripts/publish-packages.sh +++ b/scripts/publish-packages.sh @@ -3,7 +3,7 @@ set -e -echo "Installing playwrigth..." +echo "Installing playwright..." npx playwright install echo "Running build, lint, typecheck, and test..."