Skip to content

Commit

Permalink
DEP Update jquery-ui in thirdparty folder
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Dec 22, 2022
1 parent 2c0962b commit 5601812
Show file tree
Hide file tree
Showing 25 changed files with 17,182 additions and 10,202 deletions.
115 changes: 115 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
# DO NOT MERGE
# Used to debug why client/dist/js/vendor.js is different from local and failing js diff test

name: Test

on:
push:

jobs:
test:
name: Test
runs-on: ubuntu-latest

strategy:
matrix:
php:
- 7.4

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Make artifacts dir
run: mkdir artifacts

- name: Tests
run: |
echo "Running JS tests"
if [[ ! -f package.json ]]; then
echo "package.json missing"
exit 1
fi
if [[ ! -f .nvmrc ]]; then
echo "Missing .nvmrc"
exit 1
fi
wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh
php -r '
$hash = "dd4b116a7452fc3bb8c0e410ceac27e19b0ba0f900fe2f91818a95c12e92130fdfb8170fec170b9fb006d316f6386f2b";
if (hash_file("sha384", "install.sh") === $hash) {
echo "Installer verified";
} else {
echo "Installer corrupt";
unlink('install.sh');
}
echo PHP_EOL;
'
if [[ ! -f install.sh ]]; then
echo "Cannot install nvm"
exit 1
fi
. install.sh
rm install.sh
export NVM_DIR="$HOME/.nvm"
# this loads nvm into the current terminal
[[ -s "$NVM_DIR/nvm.sh" ]] && \. "$NVM_DIR/nvm.sh"
ADMIN_NPM_VERSION=
if [[ -d vendor/silverstripe/admin ]]; then
cd vendor/silverstripe/admin
nvm install
nvm use
ADMIN_NPM_VERSION=$(npm -v)
npm install -g yarn
yarn install --network-concurrency 1
cd ../../..
fi
nvm install
nvm use
if [[ $(npm -v) != $ADMIN_NPM_VERSION ]]; then
npm install -g yarn;
fi
yarn install --network-concurrency 1
if [[ $(cat package.json | jq -r '.scripts.build') != 'null' ]]; then
DIST_DIR=
if [[ -d client/dist ]]; then
DIST_DIR=client/dist
elif [[ -d dist ]]; then
DIST_DIR=dist
else
echo "No dist directory found"
exit 1
fi
echo "Deleting $DIST_DIR"
rm -rf $DIST_DIR
echo "Running yarn build"
yarn run build
echo "Running git diff"
# Add all files to ensure that any new files previously uncommitted are tracked
git add $DIST_DIR
GIT_DIFF=$(git diff --cached --name-status --relative=$DIST_DIR)
if [[ $GIT_DIFF != "" ]]; then
echo "git diff found modified files when it should not have:"
echo $GIT_DIFF
exit 1
fi
fi
if [[ $(cat package.json | jq -r '.scripts.test') != 'null' ]]; then
echo "Running yarn test"
yarn run test
fi
if [[ $(cat package.json | jq -r '.scripts.lint') != 'null' ]]; then
echo "Running yarn lint"
yarn run lint
fi
echo "Passed"
- name: Copy artifacts
run: cp client/dist/js/vendor.js artifacts

- name: Upload artifacts
uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # @v2.3.1
if: always()
with:
name: my-artifacts
path: artifacts
2 changes: 1 addition & 1 deletion client/dist/js/vendor.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions client/dist/styles/bundle.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5601812

Please sign in to comment.