From 20bd0f548f10cf98e691d87b9068fe15a31f794a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 5 Dec 2023 13:00:50 +0000 Subject: [PATCH 01/10] Update dependency flag-icons to ^7.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f47084..3f1c967 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,6 @@ }, "dependencies": { "bootstrap": "^5.3.2", - "flag-icons": "^7.0.2" + "flag-icons": "^7.0.3" } } From d53d67182b4cf61a0d7eab5f1b375ae22fb1e610 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 02:03:02 +0100 Subject: [PATCH 02/10] added workflow initially --- .forgejo/workflows/build-deploy.yml | 21 +++++++++++++++++++++ .woodpecker.yml => .woodpecker.yml.old | 0 2 files changed, 21 insertions(+) create mode 100644 .forgejo/workflows/build-deploy.yml rename .woodpecker.yml => .woodpecker.yml.old (100%) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml new file mode 100644 index 0000000..e7206fb --- /dev/null +++ b/.forgejo/workflows/build-deploy.yml @@ -0,0 +1,21 @@ +name: Build and Deploy Website + +on: + push: + branches: + - main + - develop + +jobs: + build: + name: Build and Deploy Website + runs-on: docker + container: + image: node:lts + steps: + - name: Install Dependencies + run: npm install + - name: Build English Version + run: npm run build + - name: Build German Version + run: npm run build:de diff --git a/.woodpecker.yml b/.woodpecker.yml.old similarity index 100% rename from .woodpecker.yml rename to .woodpecker.yml.old From 7f1bc7d212958b44e80918ce1053e0430dc06d81 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 02:12:52 +0100 Subject: [PATCH 03/10] updated workflow --- .forgejo/workflows/build-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index e7206fb..16d1589 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -8,7 +8,7 @@ on: jobs: build: - name: Build and Deploy Website + name: Build Website runs-on: docker container: image: node:lts From 3af1791073681b7aa795d22ad3357376487a4650 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 02:21:39 +0100 Subject: [PATCH 04/10] updated workflow --- .forgejo/workflows/build-deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index 16d1589..c4330d0 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -13,9 +13,14 @@ jobs: container: image: node:lts steps: + - uses: actions/checkout@v3 - name: Install Dependencies run: npm install - name: Build English Version run: npm run build - name: Build German Version run: npm run build:de + - uses: actions/upload-artifact@v3 + with: + name: website + path: dist/ From aa69f5dd07e18e8c46c88219a35594fb9a4e3bfd Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 02:38:03 +0100 Subject: [PATCH 05/10] updated workflow --- .forgejo/workflows/build-deploy.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index c4330d0..936e624 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -22,5 +22,18 @@ jobs: run: npm run build:de - uses: actions/upload-artifact@v3 with: - name: website + name: build path: dist/ + deploy-dev: + needs: [build] + runs-on: docker + container: + image: alpine + if: + - github.ref == 'refs/heads/develop' + steps: + - uses: actions/download-artifact@v3 + - name: Deploy English Version + run: echo "deploy dev en" + - name: Deploy German Version + run: echo "deploy dev de" From c6c3b3426c386c1b36f40cded30ca0c23e078734 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 02:49:23 +0100 Subject: [PATCH 06/10] updated workflow some fixes --- .forgejo/workflows/build-deploy.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index 936e624..e6ca3c8 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -33,7 +33,9 @@ jobs: - github.ref == 'refs/heads/develop' steps: - uses: actions/download-artifact@v3 + - name: Install Dependencies + run: which lftp || ( apk --update add lftp ) - name: Deploy English Version - run: echo "deploy dev en" + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/en/ dev.samuel-philipp.com/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST - name: Deploy German Version - run: echo "deploy dev de" + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/de/ dev.samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST From 4969625d8b8cb09d4ddc6ab27c0dac8e9c9da16a Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 02:55:14 +0100 Subject: [PATCH 07/10] updated workflow --- .forgejo/workflows/build-deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index e6ca3c8..a9055cd 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -22,13 +22,13 @@ jobs: run: npm run build:de - uses: actions/upload-artifact@v3 with: - name: build + name: website path: dist/ deploy-dev: - needs: [build] + needs: [website] runs-on: docker container: - image: alpine + image: node:lts-alpine if: - github.ref == 'refs/heads/develop' steps: From c1273bb468b0e5f80b7aba977cc2aa5e5c3c66fc Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 03:04:40 +0100 Subject: [PATCH 08/10] updated workflow --- .forgejo/workflows/build-deploy.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index a9055cd..2654b3e 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -22,10 +22,10 @@ jobs: run: npm run build:de - uses: actions/upload-artifact@v3 with: - name: website + name: website-build path: dist/ deploy-dev: - needs: [website] + needs: [website-build] runs-on: docker container: image: node:lts-alpine @@ -36,6 +36,14 @@ jobs: - name: Install Dependencies run: which lftp || ( apk --update add lftp ) - name: Deploy English Version - run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/en/ dev.samuel-philipp.com/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./website-build/dist/en/ dev.samuel-philipp.com/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + env: + ftp_host: ${{ secrets.FTP_HOST }} + ftp_username: ${{ secrets.FTP_USERNAME }} + ftp_password: ${{ secrets.FTP_PASSWORD }} - name: Deploy German Version - run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/de/ dev.samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./website-build/dist/de/ dev.samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + env: + ftp_host: ${{ secrets.FTP_HOST }} + ftp_username: ${{ secrets.FTP_USERNAME }} + ftp_password: ${{ secrets.FTP_PASSWORD }} From 0b2e557e3b241c366af9759c5e486264d60f9164 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 03:08:39 +0100 Subject: [PATCH 09/10] updated workflow --- .forgejo/workflows/build-deploy.yml | 35 ++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index 2654b3e..b8a7699 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -22,27 +22,50 @@ jobs: run: npm run build:de - uses: actions/upload-artifact@v3 with: - name: website-build + name: build path: dist/ deploy-dev: - needs: [website-build] + name: Deploy Dev Website runs-on: docker container: image: node:lts-alpine - if: - - github.ref == 'refs/heads/develop' + needs: [build] + if: github.ref == 'refs/heads/develop' steps: - uses: actions/download-artifact@v3 - name: Install Dependencies run: which lftp || ( apk --update add lftp ) - name: Deploy English Version - run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./website-build/dist/en/ dev.samuel-philipp.com/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/en/ dev.samuel-philipp.com/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST env: ftp_host: ${{ secrets.FTP_HOST }} ftp_username: ${{ secrets.FTP_USERNAME }} ftp_password: ${{ secrets.FTP_PASSWORD }} - name: Deploy German Version - run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./website-build/dist/de/ dev.samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/de/ dev.samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + env: + ftp_host: ${{ secrets.FTP_HOST }} + ftp_username: ${{ secrets.FTP_USERNAME }} + ftp_password: ${{ secrets.FTP_PASSWORD }} + deploy: + name: Deploy Website + runs-on: docker + container: + image: node:lts-alpine + needs: [build] + if: github.ref == 'refs/heads/main' + steps: + - uses: actions/download-artifact@v3 + - name: Install Dependencies + run: which lftp || ( apk --update add lftp ) + - name: Deploy English Version + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/en/ samuel-philipp.com/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST + env: + ftp_host: ${{ secrets.FTP_HOST }} + ftp_username: ${{ secrets.FTP_USERNAME }} + ftp_password: ${{ secrets.FTP_PASSWORD }} + - name: Deploy German Version + run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/de/ samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST env: ftp_host: ${{ secrets.FTP_HOST }} ftp_username: ${{ secrets.FTP_USERNAME }} From 7911f157bdfab95407dcc56b401698f89224f252 Mon Sep 17 00:00:00 2001 From: Samuel Philipp Date: Wed, 6 Dec 2023 03:13:25 +0100 Subject: [PATCH 10/10] updated workflow --- .forgejo/workflows/build-deploy.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/build-deploy.yml b/.forgejo/workflows/build-deploy.yml index b8a7699..58caf5a 100644 --- a/.forgejo/workflows/build-deploy.yml +++ b/.forgejo/workflows/build-deploy.yml @@ -38,15 +38,15 @@ jobs: - name: Deploy English Version run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/en/ dev.samuel-philipp.com/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST env: - ftp_host: ${{ secrets.FTP_HOST }} - ftp_username: ${{ secrets.FTP_USERNAME }} - ftp_password: ${{ secrets.FTP_PASSWORD }} + FTP_HOST: ${{ secrets.FTP_HOST }} + FTP_USERNAME: ${{ secrets.FTP_USERNAME }} + FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} - name: Deploy German Version run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/de/ dev.samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST env: - ftp_host: ${{ secrets.FTP_HOST }} - ftp_username: ${{ secrets.FTP_USERNAME }} - ftp_password: ${{ secrets.FTP_PASSWORD }} + FTP_HOST: ${{ secrets.FTP_HOST }} + FTP_USERNAME: ${{ secrets.FTP_USERNAME }} + FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} deploy: name: Deploy Website runs-on: docker @@ -61,12 +61,12 @@ jobs: - name: Deploy English Version run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/en/ samuel-philipp.com/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST env: - ftp_host: ${{ secrets.FTP_HOST }} - ftp_username: ${{ secrets.FTP_USERNAME }} - ftp_password: ${{ secrets.FTP_PASSWORD }} + FTP_HOST: ${{ secrets.FTP_HOST }} + FTP_USERNAME: ${{ secrets.FTP_USERNAME }} + FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} - name: Deploy German Version run: lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./build/de/ samuel-philipp.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST env: - ftp_host: ${{ secrets.FTP_HOST }} - ftp_username: ${{ secrets.FTP_USERNAME }} - ftp_password: ${{ secrets.FTP_PASSWORD }} + FTP_HOST: ${{ secrets.FTP_HOST }} + FTP_USERNAME: ${{ secrets.FTP_USERNAME }} + FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}