diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 154a646c7..1eaf7b1e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,15 +28,25 @@ jobs: release: needs: [lint] runs-on: ubuntu-latest + if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v3 + - uses: pnpm/action-setup@v2.2.2 + with: + version: 7 + - uses: actions/setup-node@v3 + with: + node-version: 16 + cache: pnpm + - name: Install dependencies + run: pnpm install --frozen-lockfile + - name: Bump version + run: pnpm version patch --commit-hooks false --git-tag-version false - name: Publish - if: github.ref == 'refs/heads/main' - run: npm publish --tag alpha + run: pnpm publish --no-git-checks --tag alpha --dry-run env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - uses: EndBug/add-and-commit@v9 - if: github.ref == 'refs/heads/main' with: message: 'Bump package version [skip ci]' default_author: github_actions diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1f130b263..6bf0d3530 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,8 +11,8 @@ jobs: id: cf-pages uses: WalshyDev/cf-pages-await@v1 with: - accountEmail: ${{ secrets.CF_ACCOUNT_EMAIL }} - apiKey: ${{ secrets.CF_API_KEY }} - accountId: '9ddae624c98677d68d93df6e524a6061' project: 'omorphia' + apiToken: ${{ secrets.CF_API_TOKEN }} + accountId: '9ddae624c98677d68d93df6e524a6061' githubToken: ${{ secrets.GITHUB_TOKEN }} + commitHash: ${{ steps.push-changes.outputs.commit-hash }} diff --git a/src/components/NavRow.svelte b/src/components/NavRow.svelte index 91d22518d..efec11e29 100644 --- a/src/components/NavRow.svelte +++ b/src/components/NavRow.svelte @@ -1,5 +1,6 @@ - - {#each links as link} + + {#each links as link, index} {link.label} + sveltekit:noscroll={!resetScroll || null} + bind:this={linkElements[index]}> + {link.label} + {/each} + element.offsetWidth + 16) + .reduce((acc, a) => acc + a, 0) + 'px'} + style:width={linkElements[activeIndex]?.offsetWidth + 'px'} />