Skip to content

Commit 6361689

Browse files
authored
Merge pull request ietf-tools#3599 from painless-security/feat/bs5
ci: update dependencies + build for bs5 branch
2 parents c89ca98 + 3acfcdb commit 6361689

5 files changed

Lines changed: 20 additions & 18 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,19 @@ jobs:
5555
echo "SHOULD_DEPLOY=true" >> $GITHUB_ENV
5656
echo "PKG_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
5757
echo "PKG_VERSION_STRICT=${NEXT_VERSION#?}" >> $GITHUB_ENV
58+
echo "::notice::Release created using branch $GITHUB_REF_NAME"
5859
elif [[ "$GITHUB_REF" =~ ^refs/tags/v* ]]; then
5960
echo "Using TAG mode: $GITHUB_REF_NAME"
6061
echo "SHOULD_DEPLOY=true" >> $GITHUB_ENV
6162
echo "PKG_VERSION=$GITHUB_REF_NAME" >> $GITHUB_ENV
6263
echo "PKG_VERSION_STRICT=${GITHUB_REF_NAME#?}" >> $GITHUB_ENV
64+
echo "::notice::Release created using tag $GITHUB_REF_NAME"
6365
else
6466
echo "Using TEST mode: v7.0.0-dev.$GITHUB_RUN_NUMBER"
6567
echo "SHOULD_DEPLOY=false" >> $GITHUB_ENV
6668
echo "PKG_VERSION=v3.0.0-dev.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
6769
echo "PKG_VERSION_STRICT=3.0.0-dev.$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
70+
echo "::notice::Non-production build created using branch $GITHUB_REF_NAME"
6871
fi
6972
7073
- name: Setup Node.js
@@ -81,15 +84,9 @@ jobs:
8184
env:
8285
DEBIAN_FRONTEND: noninteractive
8386
run: |
84-
echo "Installing NPM dependencies..."
85-
npm install
86-
npm install -g grunt-cli
87-
cd bootstrap
88-
npm install
89-
echo "Generating bootstrap files..."
90-
grunt dist
91-
cp -r dist/. ../ietf/static/ietf/bootstrap/
92-
cd ..
87+
echo "Running build script..."
88+
chmod +x ./dev/deploy/build.sh
89+
sh ./dev/deploy/build.sh
9390
echo "Setting version $PKG_VERSION_STRICT..."
9491
sed -i -r -e "s/^__version__ += '.*'$/__version__ = '$PKG_VERSION_STRICT'/" ietf/__init__.py
9592
echo "Build release tarball..."

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
- [Docker Dev Environment](docker/README.md)
2727
- [Continuous Integration](#continuous-integration)
2828
- [Database & Assets](#database--assets)
29+
- [Old Datatracker Branches](https://github.com/ietf-tools/old-datatracker-branches/branches/all)
2930
- [Bootstrap 5 Upgrade](#bootstrap-5-upgrade)
3031

3132
---

bootstrap/post-install.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

dev/deploy/build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
echo "Installing NPM dependencies..."
4+
npm install
5+
6+
echo "Packaging static assets..."
7+
npx parcel build

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"bootstrap": "^5.1.3",
77
"bootstrap-datepicker": "uxsolutions/bootstrap-datepicker",
88
"bootstrap-icons": "^1.7.0",
9-
"caniuse-lite": "^1.0.30001282",
9+
"caniuse-lite": "1.0.30001314",
1010
"d3": "^3.5.17",
1111
"flot": "^4.2.2",
1212
"highcharts": "^9.3.1",
@@ -23,12 +23,13 @@
2323
},
2424
"devDependencies": {
2525
"@parcel/transformer-sass": "^2.0.1",
26+
"browserlist": "latest",
27+
"cypress": "9.5.1",
28+
"cypress-real-events": "1.7.0",
2629
"eslint": "^8.2.0",
2730
"jquery-migrate": "^3.3.2",
28-
"parcel": "^2.0.0",
29-
"browserlist": "latest",
30-
"cypress": "9.0.0",
31-
"cypress-real-events": "1.5.1"
31+
"npm-check-updates": "12.5.2",
32+
"parcel": "^2.0.0"
3233
},
3334
"targets": {
3435
"ietf": {

0 commit comments

Comments
 (0)