Skip to content

Commit c41e00c

Browse files
authored
chore: Update workflows to use Corepack (#2576)
1 parent 1f30a6f commit c41e00c

File tree

6 files changed

+46
-24
lines changed

6 files changed

+46
-24
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ on:
77

88
jobs:
99
check_branch:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-latest
1111
outputs:
1212
should_build: ${{ steps.permitted.outputs.result }}
1313

1414
steps:
15-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: Fetch remote branches
1818
run: |
@@ -42,16 +42,22 @@ jobs:
4242
NPM_ACCESS_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
4343

4444
steps:
45-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
46-
- uses: volta-cli/action@2d68418f32546fd191eb666e232b321d5726484d # v4.1.1
45+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
46+
47+
- name: Setup Node.js
48+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
4749
with:
50+
node-version-file: '.nvmrc'
4851
cache: 'yarn'
4952

53+
- name: Enable Corepack
54+
run: corepack enable yarn
55+
5056
- name: Install dependencies
5157
run: yarn
5258

5359
- name: Build packages
54-
run: npm run build
60+
run: yarn build
5561

5662
- name: Run tests from transpiled code
5763
run: npx ocular-test dist

.github/workflows/test.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,30 @@ on:
77
- master
88
pull_request:
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
test-node:
1215
runs-on: ubuntu-22.04
16+
permissions:
17+
checks: write
18+
contents: read
1319

1420
steps:
15-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
16-
- uses: volta-cli/action@2d68418f32546fd191eb666e232b321d5726484d # v4.1.1
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
23+
- name: Setup Node.js
24+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
1725
with:
18-
cache: "yarn"
26+
node-version-file: '.nvmrc'
27+
cache: 'yarn'
28+
29+
- name: Enable Corepack
30+
run: corepack enable yarn
1931

2032
- name: Install dependencies
21-
run: |
22-
yarn bootstrap
33+
run: yarn bootstrap
2334

2435
- name: Run tests
2536
env:
@@ -29,6 +40,6 @@ jobs:
2940
yarn test ci
3041
3142
- name: Coveralls
32-
uses: coverallsapp/github-action@09b709cf6a16e30b0808ba050c7a6e8a5ef13f8d # v1.2.5
43+
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
3344
with:
3445
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/website.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
should_deploy: ${{ endsWith(github.ref, steps.get_version.outputs.latest) }}
1313

1414
steps:
15-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: Get version
1818
id: get_version
@@ -30,14 +30,18 @@ jobs:
3030
if: ${{ github.repository_owner == 'visgl' && needs.check_branch.outputs.should_deploy }}
3131

3232
steps:
33-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
33+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434
with:
3535
token: ${{ secrets.WEBSITE_DEPLOY_TOKEN }}
3636

37-
- name: Use Node.js
38-
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
37+
- name: Setup Node.js
38+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
3939
with:
40-
node-version: '18.x'
40+
node-version-file: '.nvmrc'
41+
cache: 'yarn'
42+
43+
- name: Enable Corepack
44+
run: corepack enable yarn
4145

4246
- name: Install dependencies
4347
run: |

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18.19.0

modules/react-maplibre/src/components/globe-control.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import * as React from "react";
2-
import { useEffect, memo } from "react";
3-
import { applyReactStyle } from "../utils/apply-react-style";
4-
import { useControl } from "./use-control";
5-
import { ControlPosition } from "../types/lib";
1+
import * as React from 'react';
2+
import {useEffect, memo} from 'react';
3+
import {applyReactStyle} from '../utils/apply-react-style';
4+
import {useControl} from './use-control';
5+
import {ControlPosition} from '../types/lib';
66

77
export type GlobeControlProps = {
88
/** Placement of the control relative to the map. */
@@ -12,8 +12,8 @@ export type GlobeControlProps = {
1212
};
1313

1414
function _GlobeControl(props: GlobeControlProps) {
15-
const ctrl = useControl(({ mapLib }) => new mapLib.GlobeControl(props), {
16-
position: props.position,
15+
const ctrl = useControl(({mapLib}) => new mapLib.GlobeControl(props), {
16+
position: props.position
1717
});
1818

1919
useEffect(() => {

modules/react-maplibre/src/types/lib.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import type {
1919
TerrainSpecification,
2020
LogoControl,
2121
LogoControlOptions,
22-
GlobeControl,
22+
GlobeControl
2323
} from 'maplibre-gl';
2424

2525
export type {

0 commit comments

Comments
 (0)