Skip to content

Commit

Permalink
Avoid build failure due to warning running docker build
Browse files Browse the repository at this point in the history
Rush interpretted output to stderr from the docker build command as a
build warning. This failed the build pipeline.

Also:

- Update version of Rush and pnpm.
- Remove use of toolchain package since it has been unpublished from the
  npm registry.

Signed-off-by: Mark S. Lewis <[email protected]>
  • Loading branch information
bestbeforetoday authored and denyeart committed Sep 7, 2023
1 parent 57fd694 commit ed3bab0
Show file tree
Hide file tree
Showing 12 changed files with 1,850 additions and 1,447 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name: Release

on:
create:
push:
tags:
- "v2.*"
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/schedule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ on:
jobs:
test:
uses: ./.github/workflows/test.yaml
with:
checkout-ref: ${{ matrix.checkout-ref }}
37 changes: 6 additions & 31 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ name: Test

on:
workflow_call:
inputs:
checkout-ref:
default: ''
required: false
type: string

jobs:
setup:
Expand All @@ -20,8 +15,6 @@ jobs:
BUILD_DATE: ${{ steps.builddata.outputs.BUILD_DATE }}
steps:
- uses: actions/checkout@v3
with:
ref: ${{ inputs.checkout-ref }}
- uses: actions/setup-node@v3
with:
node-version: '18.x'
Expand All @@ -48,18 +41,12 @@ jobs:
build:
runs-on: ubuntu-20.04
strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
ref: ${{ inputs.checkout-ref }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: '18.x'
- name: Install/Rebuild/UnitTest
run: |
set -xev
Expand Down Expand Up @@ -96,17 +83,11 @@ jobs:
fvtest:
runs-on: ubuntu-20.04
needs: build
strategy:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
ref: ${{ inputs.checkout-ref }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: '18.x'

- uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -156,17 +137,11 @@ jobs:
src_audit:
runs-on: ubuntu-20.04
needs: build
strategy:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
ref: ${{ inputs.checkout-ref }}
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: '18.x'
- uses: actions/download-artifact@v3
with:
name: node-tgzs
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The following [Rush categories](https://rushjs.io/pages/maintainer/add_to_repo/)

### Pre-requisites

* node v16.4.0 (npm v8.0.0) => recommend to use [nvm](https://github.com/nvm-sh/nvm)
* node v18 => recommend to use [nvm](https://github.com/nvm-sh/nvm)
* rush => `npm install -g @microsoft/rush`

> Note that npm v6 has some bugs that mean adding new dependencies etc are not properly picked up. Longer term we should consider moving to yarn or pnpm. However in practice this isn't a serious problem and has been possible to be worked around by issuing `rm ./common/config/rush/npm-shrinkwrap.json` and then `rush update`
Expand All @@ -33,7 +33,7 @@ They also need to have the `nodeenv` image present - this is build as part of th

## Using the repo

* Clone the repo, and ensure you are using node v12, and have rush installed
* Clone the repo, and ensure you are using node v18, and have rush installed
* `rush update` is needed to ensure everything is correctly linked and updated.
* `rush edge-docker` will pull down and tag the very latest docker images for the peers, orderes etc to test against

Expand Down
Loading

0 comments on commit ed3bab0

Please sign in to comment.