diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 034f4b35d..fc79952e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,16 +55,19 @@ jobs: echo "SHOULD_DEPLOY=true" >> $GITHUB_ENV echo "PKG_VERSION=$NEXT_VERSION" >> $GITHUB_ENV echo "PKG_VERSION_STRICT=${NEXT_VERSION#?}" >> $GITHUB_ENV + echo "::notice::Release created using branch $GITHUB_REF_NAME" elif [[ "$GITHUB_REF" =~ ^refs/tags/v* ]]; then echo "Using TAG mode: $GITHUB_REF_NAME" echo "SHOULD_DEPLOY=true" >> $GITHUB_ENV echo "PKG_VERSION=$GITHUB_REF_NAME" >> $GITHUB_ENV echo "PKG_VERSION_STRICT=${GITHUB_REF_NAME#?}" >> $GITHUB_ENV + echo "::notice::Release created using tag $GITHUB_REF_NAME" else echo "Using TEST mode: v7.0.0-dev.$GITHUB_RUN_NUMBER" echo "SHOULD_DEPLOY=false" >> $GITHUB_ENV echo "PKG_VERSION=v3.0.0-dev.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV echo "PKG_VERSION_STRICT=3.0.0-dev.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV + echo "::notice::Non-production build created using branch $GITHUB_REF_NAME" fi - name: Setup Node.js @@ -81,15 +84,9 @@ jobs: env: DEBIAN_FRONTEND: noninteractive run: | - echo "Installing NPM dependencies..." - npm install - npm install -g grunt-cli - cd bootstrap - npm install - echo "Generating bootstrap files..." - grunt dist - cp -r dist/. ../ietf/static/ietf/bootstrap/ - cd .. + echo "Running build script..." + chmod +x ./dev/deploy/build.sh + sh ./dev/deploy/build.sh echo "Setting version $PKG_VERSION_STRICT..." sed -i -r -e "s/^__version__ += '.*'$/__version__ = '$PKG_VERSION_STRICT'/" ietf/__init__.py echo "Build release tarball..." diff --git a/README.md b/README.md index 73cbf8cd7..f4580904a 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ - [Docker Dev Environment](docker/README.md) - [Continuous Integration](#continuous-integration) - [Database & Assets](#database--assets) +- [Old Datatracker Branches](https://github.com/ietf-tools/old-datatracker-branches/branches/all) - [Bootstrap 5 Upgrade](#bootstrap-5-upgrade) --- diff --git a/dev/deploy/build.sh b/dev/deploy/build.sh new file mode 100644 index 000000000..2e6985553 --- /dev/null +++ b/dev/deploy/build.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +echo "Installing NPM dependencies..." +npm install + +echo "Building bootstrap 3 assets..." +cd bootstrap +npm install -g grunt-cli +npm install +grunt dist +cp -r dist/. ../ietf/static/ietf/bootstrap/ +cd .. \ No newline at end of file diff --git a/package.json b/package.json index f6d376e05..7591245b8 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "bootstrap": "^5.1.3", "bootstrap-datepicker": "uxsolutions/bootstrap-datepicker", "bootstrap-icons": "^1.7.0", - "caniuse-lite": "^1.0.30001282", + "caniuse-lite": "1.0.30001314", "d3": "^3.5.17", "flot": "^4.2.2", "highcharts": "^9.3.1", @@ -23,12 +23,13 @@ }, "devDependencies": { "@parcel/transformer-sass": "^2.0.1", + "browserlist": "latest", + "cypress": "9.5.1", + "cypress-real-events": "1.7.0", "eslint": "^8.2.0", "jquery-migrate": "^3.3.2", - "parcel": "^2.0.0", - "browserlist": "latest", - "cypress": "9.0.0", - "cypress-real-events": "1.5.1" + "npm-check-updates": "12.5.2", + "parcel": "^2.0.0" }, "targets": { "ietf": {