From 4928ecef180abe381386316862e4a4972abb05c6 Mon Sep 17 00:00:00 2001 From: Rene Arumetsa Date: Mon, 9 Nov 2026 19:12:21 +0200 Subject: [PATCH 1/5] Create a cd/cd workflow --- .github/workflows/deploy.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..2eec3da --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,32 @@ +name: Build & Deploy +on: + push: { branches: [main] } + pull_request: + +jobs: + validate: # GitHub-hosted — the PR safety gate + runs-on: ubuntu-latest + name: Test + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v4 + - uses: actions/setup-node@v4 + with: { node-version: 22, cache: pnpm } + - run: pnpm install --frozen-lockfile + - run: pnpm build # astro check + astro build → fails PR if schema breaks + - run: pnpm test # run the repo's test suite + - uses: actions/upload-artifact@v4 + with: + name: site + path: dist/ + + deploy: # Push to lapikud lxc, main branch only + needs: validate + if: github.ref == 'refs/heads/main' + runs-on: [self-hosted, dev102] + steps: + - uses: actions/checkout@v4 # just for package.json + lockfile + - uses: actions/download-artifact@v4 + with: { name: site, path: dist/ } + - run: pnpm install --prod --frozen-lockfile + - run: sudo systemctl restart dev102.service \ No newline at end of file From 72413c6ecb855cad376e1579259094600cf7e693 Mon Sep 17 00:00:00 2001 From: Rene Arumetsa Date: Mon, 9 Nov 2026 19:31:08 +0200 Subject: [PATCH 2/5] Some fixes in package and runner --- .github/workflows/deploy.yml | 1 - package.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2eec3da..5c28597 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,6 @@ jobs: - uses: actions/setup-node@v4 with: { node-version: 22, cache: pnpm } - run: pnpm install --frozen-lockfile - - run: pnpm build # astro check + astro build → fails PR if schema breaks - run: pnpm test # run the repo's test suite - uses: actions/upload-artifact@v4 with: diff --git a/package.json b/package.json index e7baa63..6201d58 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "", "type": "module", "version": "0.0.1", + "packageManager": "pnpm@12.11.2", "engines": { "node": ">=22.12.0" }, From 17da394a323927ac0219ee9181f6e03bfda42e2e Mon Sep 17 00:00:00 2001 From: renkar Date: Mon, 9 Nov 2026 17:47:10 +0000 Subject: [PATCH 3/5] Update lockfile for packageManager field --- pnpm-lock.yaml | 158 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 11c20b7..231897c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,3 +1,161 @@ +--- +lockfileVersion: '9.0' + +importers: + + .: + configDependencies: {} + packageManagerDependencies: + pnpm: + specifier: 12.11.2 + version: 12.11.2 + +packages: + + '@pnpm/exe.android-arm64@12.11.2': + resolution: {integrity: sha512-owLw13OfPkEoY+hLBNeeG+dCFhywr7q2d/EHPz4mNL2RhKnv8gNwMARkjkiDQu234aItVwFNDeGnmQXm+ikkAg==} + cpu: [arm64] + os: [android] + + '@pnpm/exe.android-x64@12.11.2': + resolution: {integrity: sha512-GYPkVebl4iokOA/4MPSpGoUVfFlsth7uqOCe1XiaiM23LAdvUOMJBObqHJijr89ZqjwHm9pO6vO45GRwJ2U2qA==} + cpu: [x64] + os: [android] + + '@pnpm/exe.darwin-arm64@12.11.2': + resolution: {integrity: sha512-n9M4On66y8FDxUAKgMO1FXt0qihyG4e+56p3/F0uo8Bx9KplW8BwKVnXigzCJ8aNM6sVVPkOE6M9XXbeVIxnZA==} + cpu: [arm64] + os: [darwin] + + '@pnpm/exe.darwin-x64@12.11.2': + resolution: {integrity: sha512-oSW7n3sBT0c0cyk4kj10T2Y6Mpm+OFEiCAWozgX039tdoI6yqJF1uaFD3sw7ugLdu6VV3+uY0pa1TUZIPdxDWA==} + cpu: [x64] + os: [darwin] + + '@pnpm/exe.freebsd-x64@12.11.2': + resolution: {integrity: sha512-qbzc3KoDpa/Lkf8vs3jnDe6dUUbso+6eLIyssYFMiliLpYNxn8dirk11YoNnOQcdHVB50v5RFls1Yid6ttT5pg==} + cpu: [x64] + os: [freebsd] + + '@pnpm/exe.linux-arm64-musl@12.11.2': + resolution: {integrity: sha512-uMEYDwKRktGwANubQ+kYCwmhNwg3Ik6qK89ahsbQ5cP30R/5FVJb/T99vr9XRUBC/A7mZI6eeT92oyVas9ACyg==} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-arm64@12.11.2': + resolution: {integrity: sha512-6e8ZAQUwFXAWHHHv5FesWqf/kEK04wuitBv5f/gxzkC0DiBfaixr+f+6JQede8SF4Ji5LcMwVFJbzAtffpWxEg==} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-ppc64@12.11.2': + resolution: {integrity: sha512-Ui8A4nepkVupx2VpuFfysEluMvWK6gTB5rgVts7Ss/+8dj0RD28x3F/seNeH/zSypgC6yKdV6qsKVQh/uffTuQ==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-riscv64@12.11.2': + resolution: {integrity: sha512-i1yLdQ5bu+wjQ+srtFoJAaY2gN/+oXHFdjul4llCeoDxHE0rTIG3R41NhHfCjyFPW4+CpbBT58933CL9sMOCnA==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-s390x@12.11.2': + resolution: {integrity: sha512-YS1/lhPjjTsN4QL50VaFZKRa3Uc/bDnhE8eKbJMFvuX06UuFS5YaiDg04APoZdfVSGqTfX27QAg7rfLMSWaqxA==} + cpu: [s390x] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-x64-musl@12.11.2': + resolution: {integrity: sha512-7eIxQR05fvJxCujUSKp5KTtehJ7QqrgqP/HD1+BcB/SaV2Be4XI1PEHiOgA1zxsiMIeMvTF6E4G4dYHrFjeXRg==} + cpu: [x64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-x64@12.11.2': + resolution: {integrity: sha512-FK7QKe24AYgppJwO3mpooYptduuvIGqKJPi5ac7MdnWkjUy46JBfYhCW0grnkWKC8YOf0x+vGviuQqJEj3SpQQ==} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.win32-arm64@12.11.2': + resolution: {integrity: sha512-PCTjVDdJb6VvraZxrEeFv6EqEA0hhIsAySx28e95J2Tqpi88hLpgOXgNqV0vpxq9A+b8GLQfyk/D+1UlJPv/YQ==} + cpu: [arm64] + os: [win32] + + '@pnpm/exe.win32-x64@12.11.2': + resolution: {integrity: sha512-8sgX86OvRjJ3yZs/TvGR2L31wH9ScPZ+f+geKI3ikuB0RRiK3i4LlTRO8OXN6pdRqj8epMde4312MCjj7JsJdA==} + cpu: [x64] + os: [win32] + + pnpm@12.11.2: + resolution: {integrity: sha512-JaUWUqGWeFr18ovabf6NxYLr76SsHRgCIc4TkCMcX7dmN4IupLbkYzznSs3LCnf3Ja8RutOBd/3t2u6BipVcuQ==} + engines: {node: '>=18.*'} + hasBin: true + +snapshots: + + '@pnpm/exe.android-arm64@12.11.2': + optional: true + + '@pnpm/exe.android-x64@12.11.2': + optional: true + + '@pnpm/exe.darwin-arm64@12.11.2': + optional: true + + '@pnpm/exe.darwin-x64@12.11.2': + optional: true + + '@pnpm/exe.freebsd-x64@12.11.2': + optional: true + + '@pnpm/exe.linux-arm64-musl@12.11.2': + optional: true + + '@pnpm/exe.linux-arm64@12.11.2': + optional: true + + '@pnpm/exe.linux-ppc64@12.11.2': + optional: true + + '@pnpm/exe.linux-riscv64@12.11.2': + optional: true + + '@pnpm/exe.linux-s390x@12.11.2': + optional: true + + '@pnpm/exe.linux-x64-musl@12.11.2': + optional: true + + '@pnpm/exe.linux-x64@12.11.2': + optional: true + + '@pnpm/exe.win32-arm64@12.11.2': + optional: true + + '@pnpm/exe.win32-x64@12.11.2': + optional: true + + pnpm@12.11.2: + optionalDependencies: + '@pnpm/exe.android-arm64': 12.11.2 + '@pnpm/exe.android-x64': 12.11.2 + '@pnpm/exe.darwin-arm64': 12.11.2 + '@pnpm/exe.darwin-x64': 12.11.2 + '@pnpm/exe.freebsd-x64': 12.11.2 + '@pnpm/exe.linux-arm64': 12.11.2 + '@pnpm/exe.linux-arm64-musl': 12.11.2 + '@pnpm/exe.linux-ppc64': 12.11.2 + '@pnpm/exe.linux-riscv64': 12.11.2 + '@pnpm/exe.linux-s390x': 12.11.2 + '@pnpm/exe.linux-x64': 12.11.2 + '@pnpm/exe.linux-x64-musl': 12.11.2 + '@pnpm/exe.win32-arm64': 12.11.2 + '@pnpm/exe.win32-x64': 12.11.2 + +--- lockfileVersion: '9.0' settings: From 155af8d5eff828af61215c891e7c75102e0abcca Mon Sep 17 00:00:00 2001 From: Rene Arumetsa Date: Mon, 9 Nov 2026 20:04:14 +0200 Subject: [PATCH 4/5] Add required description field to git-workshop-1 --- src/content/workshops/git-workshop-1.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/content/workshops/git-workshop-1.md b/src/content/workshops/git-workshop-1.md index 83ab807..c8e3717 100644 --- a/src/content/workshops/git-workshop-1.md +++ b/src/content/workshops/git-workshop-1.md @@ -3,6 +3,7 @@ title: |- Git Workshop date: "2026-11-04T18:30:00+02:00" location: ICO-316 +description: Have you ever wondered how the code you write on your computer is connected to the repositories you have in your GitHub or GitLab account? What happens deeper than just pressing buttons like commit and push in an IDE? What even is Git and why is it so important for every developer? facebookEventUrl: https://fb.me/e/gGKxweX7A speakers: - name: Kerdo Käärma From e5bc18f3abea4ce84ff3f9b38a397fbbe4ffd30c Mon Sep 17 00:00:00 2001 From: Rene Arumetsa Date: Mon, 9 Nov 2026 20:10:58 +0200 Subject: [PATCH 5/5] Fix deploy: sync build into serving dir, source nvm, restart --- .github/workflows/deploy.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5c28597..e25f586 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,8 +24,14 @@ jobs: if: github.ref == 'refs/heads/main' runs-on: [self-hosted, dev102] steps: - - uses: actions/checkout@v4 # just for package.json + lockfile - - uses: actions/download-artifact@v4 + - uses: actions/checkout@v4 # provides package.json + lockfile + - uses: actions/download-artifact@v4 # the site built on the hosted runner with: { name: site, path: dist/ } - - run: pnpm install --prod --frozen-lockfile - - run: sudo systemctl restart dev102.service \ No newline at end of file + - name: Deploy build into serving dir and restart + run: | + source /home/web/.nvm/nvm.sh # node/pnpm come from nvm + rsync -a --delete dist/ /home/web/dev102/dist/ # swap in the new build + cp package.json pnpm-lock.yaml /home/web/dev102/ # keep manifest in sync + cd /home/web/dev102 + pnpm install --prod --frozen-lockfile # runtime deps only + sudo systemctl restart dev102.service \ No newline at end of file