From 43394bc1bcfec4176d44066cdec7b0e1e3f93b3a Mon Sep 17 00:00:00 2001 From: Bernhard Kirchen Date: Fri, 20 Sep 2024 17:07:14 +0200 Subject: [PATCH] actions: enable corepack to use fixed version of yarn this allows us to fix the version of yarn, the Node.js package manager, to a particular version. using corepack is the recommended way to use yarn these days. --- .github/workflows/build.yml | 13 +++++++++++-- .github/workflows/yarnlint.yml | 12 +++++++++--- .github/workflows/yarnprettier.yml | 10 ++++++++-- webapp/package.json | 3 ++- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e8558a..1cd2da3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,6 +79,11 @@ jobs: python -m pip install --upgrade pip pip install --upgrade platformio setuptools + - name: Enable Corepack + run: | + cd webapp + corepack enable + - name: Setup Node.js and yarn uses: actions/setup-node@v4 with: @@ -87,10 +92,14 @@ jobs: cache-dependency-path: "webapp/yarn.lock" - name: Install WebApp dependencies - run: yarn --cwd webapp install --frozen-lockfile + run: | + cd webapp + yarn install --frozen-lockfile - name: Build WebApp - run: yarn --cwd webapp build + run: | + cd webapp + yarn build - name: Build firmware run: pio run -e ${{ matrix.environment }} diff --git a/.github/workflows/yarnlint.yml b/.github/workflows/yarnlint.yml index 10d7c12..8bb23a5 100644 --- a/.github/workflows/yarnlint.yml +++ b/.github/workflows/yarnlint.yml @@ -6,8 +6,14 @@ jobs: build: runs-on: ubuntu-latest + defaults: + run: + working-directory: webapp + steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - name: Enable Corepack + run: corepack enable - name: Setup Node.js and yarn uses: actions/setup-node@v4 with: @@ -16,7 +22,7 @@ jobs: cache-dependency-path: "webapp/yarn.lock" - name: Install WebApp dependencies - run: yarn --cwd webapp install --frozen-lockfile + run: yarn install --frozen-lockfile - name: Linting - run: yarn --cwd webapp lint \ No newline at end of file + run: yarn lint diff --git a/.github/workflows/yarnprettier.yml b/.github/workflows/yarnprettier.yml index 1727eea..ebb0173 100644 --- a/.github/workflows/yarnprettier.yml +++ b/.github/workflows/yarnprettier.yml @@ -6,8 +6,14 @@ jobs: build: runs-on: ubuntu-latest + defaults: + run: + working-directory: webapp + steps: - uses: actions/checkout@v4 + - name: Enable Corepack + run: corepack enable - name: Setup Node.js and yarn uses: actions/setup-node@v4 with: @@ -16,7 +22,7 @@ jobs: cache-dependency-path: "webapp/yarn.lock" - name: Install WebApp dependencies - run: yarn --cwd webapp install --frozen-lockfile + run: yarn install --frozen-lockfile - name: Check Formatting - run: yarn --cwd webapp prettier --check src/ + run: yarn prettier --check src/ diff --git a/webapp/package.json b/webapp/package.json index e3c9b4a..04e7d84 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -46,5 +46,6 @@ "vite-plugin-compression": "^0.5.1", "vite-plugin-css-injected-by-js": "^3.5.1", "vue-tsc": "^2.1.6" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" }