diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index a4c65a1..7c8110b 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -10,6 +10,7 @@ jobs: fail-fast: false matrix: node-version: [20.x] + pnpm-version: [8] redis-version: [latest] python-version: ["3.9", "3.10", "3.11"] os: [ubuntu-latest] @@ -32,6 +33,11 @@ jobs: with: node-version: ${{ matrix.node-version }} + - name: Install PNPM + uses: pnpm/action-setup@v3 + with: + version: ${{ matrix.pnpm-version }} + - name: Start Redis uses: supercharge/redis-github-action@1.7.0 with: @@ -44,12 +50,12 @@ jobs: echo "HYPERGLASS_HOST=127.0.0.1" >> $GITHUB_ENV echo "HYPERGLASS_PORT=8001" >> $GITHUB_ENV + - name: Install + run: rye install && rye sync + - name: Enter venv run: . .venv/bin/activate - - name: Install - run: rye install - - name: Lint (Rye) run: rye lint diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 2b6d8fe..51ac6e2 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -24,7 +24,8 @@ jobs: with: node-version: ${{ matrix.node-version }} - - uses: pnpm/action-setup@v3 + - name: Install PNPM + uses: pnpm/action-setup@v3 with: version: ${{ matrix.pnpm-version }} diff --git a/hyperglass/ui/tsconfig.json b/hyperglass/ui/tsconfig.json index da692c1..78bbc8e 100644 --- a/hyperglass/ui/tsconfig.json +++ b/hyperglass/ui/tsconfig.json @@ -40,7 +40,6 @@ "**/*.tsx", "types/*.d.ts", "next.config.js", - "nextdev.js", - "hyperglass.json" + "nextdev.js" ] }