.ci/deploy.sh

@@ -10,9 +10,9 @@ rm -rf $rootDir/public
 rm -rf $rootDir/theme
 mkdir $rootDir/public
 
-if [[ $CI_COMMIT_BRANCH == "develop" ]]; then
+if [[ $CI_COMMIT_REF_NAME == "develop" ]]; then
     version="latest";
-elif [[ $CI_COMMIT_BRANCH == "master" ]]; then
+elif [[ $CI_COMMIT_REF_NAME == "master" ]]; then
     version="stable";
 else
     version="unstable";
@@ -33,7 +33,7 @@ nBlades=0
 for d in $(find . -maxdepth 1 -type d)
 do
     if [[ "${d}" == *20* ]]; then
-        cd "${d}"
+        pushd "${d}"
         echo "changed to ${d}"
         for d1 in $(find . -maxdepth 1 -type d)
         do
@@ -46,20 +46,23 @@ do
                 # create the required folders in public
                 mkdir -p $rootDir/public/$BLADE/$version
 
-                # change to the blade directory to be built
-                cd $BLADE
+                echo "going to $BLADE..."
+                pushd $BLADE
 
                 # run contribute
-                cp ../../template/Gruntfile.coffee .
-                ln -s ../../theme/package.json package.json
-                ln -s ../../theme theme
+                cp -v ../../template/Gruntfile.coffee .
+                ln -sv ../../theme/package.json package.json
+                ln -sv ../../theme theme
 
                 # install npm
-                yarn global add grunt-cli generator-reveal
+                echo "installing deps"
+                yarn add grunt-cli generator-reveal grunt
                 yarn install
 
-                grunt dist
-                mv public/* $rootDir/public/$BLADE/$version/.
+                echo "running dist"
+                yarn exec grunt dist
+                echo "copying to common public dir"
+                cp -rLv public/* $rootDir/public/$BLADE/$version/.
 
                 echo " > latest built for file set ${BLADE}"
 
@@ -75,10 +78,10 @@ do
                 echo "autoredirect file set"
 
                 # move back out
-                cd ..
+                popd
                 echo " > -----------------------------------------------------"
             fi
         done
-        cd "${rootDir}"
+        popd
     fi
 done

.ci/generateIndex.py

@@ -19,7 +19,7 @@ localroot = os.getcwd()
 
 
 # generate the index properly speaking
-cardDirs = ["2020", "2019"]
+cardDirs = ["2023", "2022", "2021", "2020", "2019"]
 index=''
 
 # determine first the directories
@@ -68,4 +68,4 @@ with open(indexFile, 'w') as file:
   file.write(filedata)
 
 print("\n > New index generated and saved in " + indexFile)
-os.chdir("..")
+os.chdir("..")
\ No newline at end of file

.gitignore

+*.ai
 site/
 courses.lcsb.uni.lu
 index.html
@@ -22,3 +23,4 @@ package.json
 ./theme/package.json
 __pycache__/
 contribute.egg-info/
+.*.swp

.gitlab-ci.yml

@@ -56,7 +56,7 @@ build:website:
     JEKYLL_ENV: production
 
 build:courses:
-  image: git-r3lab.uni.lu:4567/r3/docker/nodejs-yarn-grunt
+  image: node:19-bullseye
   stage: build
   rules:
     - if: $CI_COMMIT_BRANCH == "develop"
@@ -72,6 +72,7 @@ upload:
   stage: deploy
   image: alpine
   before_script:
+    - apk add rsync
     - 'which ssh-agent || ( apk add --update openssh )'
     - eval $(ssh-agent -s)
     - echo "$B64SSHPRIVKEY" | base64 -d | tr -d '\r' | ssh-add - > /dev/null
@@ -83,5 +84,5 @@ upload:
     - if: $CI_COMMIT_BRANCH == "develop"
     - if: $CI_COMMIT_BRANCH == "master"
   script:
-    - scp -P $SSHPORT -r site/* $SSHCONNECT:~/web/latest
-    - scp -P $SSHPORT -r public/* $SSHCONNECT:~/web/latest
+    - rsync -ravu --info=progress2 -e "ssh -p $SSHPORT" site/* $SSHCONNECT:~/web/latest
+    - rsync -ravu --info=progress2 -e "ssh -p $SSHPORT" public/* $SSHCONNECT:~/web/latest

.gitmodules

 [submodule "theme"]
 	path = theme
-	url = https://git-r3lab.uni.lu/R3/outreach/theme.git
+	url = https://gitlab.lcsb.uni.lu/R3/outreach/theme.git
 
 

2021/2021-03-18_basicGitTraining/slides/best_practices.md

 # Best practices
 
-* `pull` before `push`
+* `pull` before `push` and, generally, before starting to work
 * Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop`
 * Do **not push** to `master`, but **submit a Pull Request (PR)**
 * Get your code **reviewed** by your peers (submit a PR!)

2021/2021-03-18_basicGitTraining/slides/configuration.md

@@ -38,7 +38,7 @@ If there are 2 files named `id_rsa`, you have an SSH key.
 
 If you don’t have yet an SSH key, you have to generate one:
 ```bash
-$ ssh-keygen -t rsa # -b 4096
+$ ssh-keygen -t rsa -b 4096
 ```
 
 If you set a password to your key (recommended), add it to the `ssh-agent`:

2021/2021-03-18_basicGitTraining/slides/essential_commands.md

@@ -45,6 +45,9 @@ $ cp firstnameLastname.md myName.md
 
 Then, make your changes with your favorite editor!
 
+<br><br>
+Reference for markdown: https://howto.lcsb.uni.lu/?contribute:markdown
+
 
 
 # Add your file to the stage
@@ -71,7 +74,11 @@ $ git status
 ```bash
 $ git diff
 ```
-exit with `q`
+exit with `q`.
+
+<br>
+
+![bulb](slides/img/bulb.png)  If it is a long diff, you can display additional lines with space.
 
 
 

2021/2021-03-18_basicGitTraining/slides/forks.md

@@ -46,7 +46,7 @@ Then, clone your fork to your home directory!
 <img src="slides/img/icon-live-demo.png" height="100px">
 
 ```bash
-$ $ git clone git@github.com:<yourName>/basic-git-practice.git
+$ git clone git@github.com:<yourName>/basic-git-practice.git
 ```
 
 Change to the practice directory with:

2021/2021-03-18_basicGitTraining/slides/img/Git-Logo-Black.png

+../../../../2020/2020-03-30_basicGitTraining/slides/img/Git-Logo-Black.png
\ No newline at end of file

2021/2021-03-18_basicGitTraining/slides/img/branch-create.png

+../../../../2020/2020-03-30_basicGitTraining/slides/img/branch-create.png
\ No newline at end of file

2021/2021-03-18_basicGitTraining/slides/img/branch-master.png

+../../../../2020/2020-03-30_basicGitTraining/slides/img/branch-master.png
\ No newline at end of file

2021/2021-03-18_basicGitTraining/slides/img/branch-merge.png

+../../../../2020/2020-03-30_basicGitTraining/slides/img/branch-merge.png
\ No newline at end of file

2021/2021-03-18_basicGitTraining/slides/img/bulb.png

+../../../../2020/2020-03-30_basicGitTraining/slides/img/bulb.png
\ No newline at end of file