Skip to content

Commit

Permalink
try to have last versuion
Browse files Browse the repository at this point in the history
  • Loading branch information
ignatandrei committed Apr 28, 2024
1 parent 82fc981 commit 3309279
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 30 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,27 @@ jobs:
- name: Use Node
uses: actions/setup-node@v1
with:
node-version: '16.10.0'
node-version: '20.9.0'
#node-version: '16.10.0'
#https://gist.github.com/LayZeeDK/c822cc812f75bb07b7c55d07ba2719b3
# Runs a set of commands using the runners shell
- name: Run the build
run: |
cd src
ls
cd react_new_app
ls
cd blockly_automation
npm i
cd blockly10
cd npm i
npm run build
cd build
ls -l
cd build
ls -l
# cd react_new_app
# ls
# cd blockly_automation
# npm i
# npm run build
# cd build
# ls -l
# cd src
# cd AngWorkspace
# npm i -g [email protected]
Expand Down
58 changes: 39 additions & 19 deletions .github/workflows/taggedRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
on:
push:
tags:
- "vAng*"
- "vBlockly*"

workflow_dispatch:

Expand All @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.13.0]
node-version: [20.9.0]

steps:
- name: 'Checkout Github Action'
Expand All @@ -34,10 +34,17 @@ jobs:
- name: npm install
run: |
cd src
cd AngWorkspace
npm i -g [email protected]
npm i
cd src
cd blockly10
npm i
# cd src
# cd react_new_app
# cd blockly_automation
# npm i
# cd src
# cd AngWorkspace
# npm i -g [email protected]
# npm i
# echo 'install angular'
#npm i @angular/[email protected]
# cd projects
Expand All @@ -62,26 +69,39 @@ jobs:
- name: npm modify docs
run: |
cd src
cd AngWorkspace
echo "build"
npm run buildGitHubPages
ls -l dist/auto-blockly-app
cd blockly10
npm run build
cd ..
cd ..
rm -r docs/*
cp -r src/AngWorkspace/dist/auto-blockly-app/* docs/
cp -r src/blockly10/build/* docs/
cp docs/index.html docs/404.html
cd docs
echo "${{github.ref_name}}" > version.txt
cd ..
ls -l docs/
# cd src
# cd AngWorkspace
# echo "build"
# npm run buildGitHubPages
# ls -l dist/auto-blockly-app
# cd ..
# cd ..
# rm -r docs/*
# cp -r src/AngWorkspace/dist/auto-blockly-app/* docs/
# cp docs/index.html docs/404.html
# cd docs
# echo "${{github.ref_name}}" > version.txt
# cd ..
# ls -l docs/
- name: Archive production artifacts
uses: actions/upload-artifact@v2
with:
name: AutoBlocklyApp
path: 'src/AngWorkspace/dist/auto-blockly-app/*'
path: 'src/blockly10/build/*'
retention-days: 1

- name : autocommit
Expand All @@ -103,7 +123,7 @@ jobs:
type: 'zip'
filename: 'releaseBlocklyAutomation.zip'
path: 'auto-blockly-app/'
directory: '${{github.workspace}}/src/AngWorkspace/dist/'
directory: '${{github.workspace}}/src/blockly10/build/'
exclusions: '*.git* /*node_modules/* .editorconfig'


Expand All @@ -115,16 +135,16 @@ jobs:
- name: making releases of loaders
run: |
find ${{github.workspace}} -type f -name "*.zip"
cp ${{github.workspace}}/src/AngWorkspace/dist/releaseBlocklyAutomation.zip ${{github.workspace}}/releaseBlocklyAutomation.zip
rm -r src/AngWorkspace/dist/*
cp ${{github.workspace}}/ssrc/blockly10/build/releaseBlocklyAutomation.zip ${{github.workspace}}/releaseBlocklyAutomation.zip
rm -r src/blockly10/build/*
cd src
cd AngWorkspace
npm run buildGitHubPages
cd blockly10
npm run build
cd ..
rm -r Loaders/SimpleSite/AutoBlocklySimple/wwwroot/BlocklyAutomation/*
cp -r AngWorkspace/dist/auto-blockly-app/* Loaders/SimpleSite/AutoBlocklySimple/wwwroot/BlocklyAutomation/
cp -r src/blockly10/build/* Loaders/SimpleSite/AutoBlocklySimple/wwwroot/BlocklyAutomation/
rm -r Local/LocalAPI/LocalAPI/wwwroot/BlocklyAutomation/*
cp -r AngWorkspace/dist/auto-blockly-app/* Local/LocalAPI/LocalAPI/wwwroot/BlocklyAutomation/
cp -r src/blockly10/build/* Local/LocalAPI/LocalAPI/wwwroot/BlocklyAutomation/
#cp -r Local/LocalAPI/LocalAPI/wwwroot/customBlocklyAutomation/* Local/LocalAPI/LocalAPI/wwwroot/BlocklyAutomation/
rm -r Local/LocalAPI/LocalAPI/wwwroot/customBlocklyAutomation/*
cd Loaders
Expand Down
8 changes: 4 additions & 4 deletions src/blockly10/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-json-tree": "0.18.0",
"react-router-dom": "6.4.3",
"react-scripts": "5.0.1",
"react-shepherd": "4.1.0",
"shepherd.js":"10.0.0",
"rxjs": "7.5.7",
"shepherd.js": "10.0.0",
"swagger-client": "3.18.5",
"typescript": "4.8.4",
"web-vitals": "2.1.4",
"react-router-dom": "6.4.3"
"web-vitals": "2.1.4"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -61,9 +61,9 @@
]
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@blockly/dev-scripts": "3.1.1",
"@types/file-saver": "2.0.5",
"dependency-cruiser": "12.10.0"

}
}

0 comments on commit 3309279

Please sign in to comment.