diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c62f82ff1..f86c3fc60 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,37 +9,17 @@ on: - '!packages/components/**' jobs: - lint: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Set up Node - uses: actions/setup-node@v3 - with: - registry-url: 'https://registry.npmjs.org' - node-version-file: '.nvmrc' - cache: 'yarn' - - name: Install dependencies - run: yarn install --immutable - - name: ESLint - run: yarn lint - test: runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 - - name: Set up Node - uses: actions/setup-node@v3 - with: - registry-url: 'https://registry.npmjs.org' - node-version-file: '.nvmrc' - cache: 'yarn' - name: Install dependencies run: yarn install --immutable - name: Build run: yarn build:all + - name: ESLint + run: yarn lint - name: Build Android run: yarn android:bundle - name: Test diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e7c2127c4..cdfc9ddbf 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,29 +5,8 @@ on: branches: [ main ] jobs: - Lint: - if: "${{ contains(github.event.head_commit.message, 'chore(release): publish') == false }}" - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Set up Node - uses: actions/setup-node@v3 - with: - registry-url: 'https://registry.npmjs.org' - node-version-file: '.nvmrc' - cache: 'yarn' - - - name: Install dependencies - run: yarn install --immutable - - - name: ESLint - run: yarn lint - Build: if: "${{ contains(github.event.head_commit.message, 'chore(release): publish') == false }}" - needs: Lint runs-on: ubuntu-latest steps: - name: Checkout code @@ -61,6 +40,9 @@ jobs: - name: Build run: yarn build:all + - name: ESLint + run: yarn lint + - name: Build Android run: yarn android:bundle diff --git a/.github/workflows/web.release.prod.yml b/.github/workflows/web.release.prod.yml index b3afda376..51f1ae7c3 100644 --- a/.github/workflows/web.release.prod.yml +++ b/.github/workflows/web.release.prod.yml @@ -12,54 +12,27 @@ on: - '!*standardnotes/*web*alpha*' jobs: - lint: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Set up Node - uses: actions/setup-node@v3 - with: - registry-url: 'https://registry.npmjs.org' - node-version-file: '.nvmrc' - cache: 'yarn' - - name: Install dependencies - run: yarn install --immutable - - name: ESLint - run: yarn lint - test: runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 - - name: Set up Node - uses: actions/setup-node@v3 - with: - registry-url: 'https://registry.npmjs.org' - node-version-file: '.nvmrc' - cache: 'yarn' - name: Install dependencies run: yarn install --immutable - name: Build run: yarn build:web + - name: ESLint + run: yarn lint - name: Test run: yarn test - deploy: - needs: [lint, test] + needs: test runs-on: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v3 - - name: Set up Node - uses: actions/setup-node@v3 - with: - registry-url: 'https://registry.npmjs.org' - node-version-file: '.nvmrc' - cache: 'yarn' - name: Install dependencies run: yarn install --immutable - name: Build