From 074e19052ae54ddd76ef9af2f26de884094340ba Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Wed, 14 May 2025 20:47:15 -0300 Subject: [PATCH 1/6] Add Aider files to .gitignore - Ignore Aider files to prevent them from being committed. - This ensures that project-specific Aider configurations are not shared. - Aider is a development tool and its files are not part of the core project. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 87f9c74..56d5fe3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,6 @@ hugo.linux # Temporary lock file while building /.hugo_build.lock *.webp + +# Aider +.aider* From 3cc44ab337f565f4e386d721b24b55f1332ca59e Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Wed, 14 May 2025 20:28:21 -0300 Subject: [PATCH 2/6] Add links to Gitea and GitHub repositories. - Adds links to the Gitea and GitHub repositories in the sub-footer. - Includes corresponding image assets. - Updates Buy Me a Coffee link text for clarity. --- layouts/partials/sub-footer.html | 8 +++++++- static/pics/gitea-small.png | Bin 0 -> 411 bytes static/pics/github-small.png | Bin 0 -> 351 bytes 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 static/pics/gitea-small.png create mode 100644 static/pics/github-small.png diff --git a/layouts/partials/sub-footer.html b/layouts/partials/sub-footer.html index 6f348b9..fc06577 100644 --- a/layouts/partials/sub-footer.html +++ b/layouts/partials/sub-footer.html @@ -7,9 +7,15 @@
  • yams.media
    • +
  • + git.rogs.me/rogs/yams +
  • gitlab.com/rogs/yams
    • +
  • + github.com/rogsme/yams +
  • Discord
    • @@ -22,7 +28,7 @@ {{ end }}
  • - + 🍕 Support YAMS! 🤑
    • diff --git a/static/pics/gitea-small.png b/static/pics/gitea-small.png new file mode 100644 index 0000000000000000000000000000000000000000..abcedd33681470d8064112297c3e106fc3d424ea GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}Z-7sTt9yY@;w<%qnW_mh)xZeI zfTFG~@ef{Kx%B7|P&{{$1&};=V-=9xb$LO?JbkcYwY0f4TQ^pMU=@{F(Ci^xuCeahAUr_tt0qc*=dC^@YieSAW<3{;+BoO79XFx$XBL3;+JI|ftZab*HPE~qNU9srmc?*6% ay~W*;$^A1*BlMCpKA_;=Ha9JP&s0Bo7K(&BPfU+5+SbwU`}U*uVIBc9`VU<`@>C Date: Wed, 14 May 2025 20:49:23 -0300 Subject: [PATCH 3/6] Update Buy Me a Coffee link text - Translate the Buy Me a Coffee link text to French. - Ensures the link is accessible to a wider audience. --- layouts/partials/sub-footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/sub-footer.html b/layouts/partials/sub-footer.html index fc06577..ca77614 100644 --- a/layouts/partials/sub-footer.html +++ b/layouts/partials/sub-footer.html @@ -28,7 +28,7 @@ {{ end }}
  • - 🍕 Support YAMS! 🤑 + 🍕 Soutenez YAMS! 🤑
    • From de97544a09949bc63517d6ced737716fb4841b14 Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Wed, 14 May 2025 20:50:04 -0300 Subject: [PATCH 4/6] Remove GitLab CI configuration - Removes the .gitlab-ci.yml file. - This file was used for automated builds and deployments. - The automated deployment pipeline is no longer needed. --- .gitlab-ci.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 1a9b73e..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,30 +0,0 @@ -image: alpine:latest - -stages: - - test - - deploy - -test_build: - stage: test - image: klakegg/hugo:0.111.3-ext-alpine-ci - script: - - hugo version - - hugo --minify - only: - - merge_requests - - fr-translation - -deploy: - stage: deploy - before_script: - - 'command -v ssh-agent >/dev/null || ( apk add --update openssh )' - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan $SSH_HOST >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - script: - - ssh -p $SSH_PORT $SSH_USER@$SSH_HOST "cd repo-fr && git stash && git pull --force origin fr-translation && ./build.sh" - only: - - fr-translation From 34f25a473adfcddb756ac4a17bd642f31880a1fc Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Wed, 14 May 2025 20:34:07 -0300 Subject: [PATCH 5/6] Add GitHub Actions deployment workflow - Adds a workflow to build and deploy the Hugo site. - Uses klakegg/hugo:0.111.3-ext-alpine-ci for the build environment. - Checks out the code in both build and deploy jobs. - Deploys to the server using SSH keys and secrets. - Only deploys on pushes to the master branch. - Uses `git stash` and `git pull --force` for deployment. --- .gitea/workflows/deploy.yml | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .gitea/workflows/deploy.yml diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..18cf6d3 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,49 @@ +name: Hugo Build and Deploy + +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + test_build: + name: Build Hugo Site + runs-on: ubuntu-latest + container: + image: klakegg/hugo:0.111.3-ext-alpine-ci + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Check Hugo Version and Build + run: | + hugo version + hugo --minify + + deploy: + name: Deploy to Server + runs-on: ubuntu-latest + needs: test_build + if: github.ref == 'refs/heads/master' + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Setup SSH and Deploy + run: | + eval "$(ssh-agent -s)" + mkdir -p ~/.ssh + echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + chmod 700 ~/.ssh + ssh-keyscan "$SSH_HOST" >> ~/.ssh/known_hosts + chmod 644 ~/.ssh/known_hosts + + ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" 'cd repo && git stash && git pull --force origin master && ./build.sh' + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SSH_USER: ${{ secrets.SSH_USER }} + SSH_HOST: ${{ secrets.SSH_HOST }} + SSH_PORT: ${{ secrets.SSH_PORT }} From c88b9b0327667545c0b8c88e5cafd09b71a80bb7 Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Wed, 14 May 2025 20:53:46 -0300 Subject: [PATCH 6/6] Update deployment workflow for French translation - Adjust workflow trigger to `fr-translation` branch. - Rename deployment job for clarity. - Update deployment script to pull from `fr-translation` branch. - Change deployment directory to `repo-fr`. --- .gitea/workflows/deploy.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 18cf6d3..431c2b6 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -1,12 +1,12 @@ -name: Hugo Build and Deploy +name: Hugo Build and Deploy (FR) on: push: branches: - - master + - fr-translation pull_request: branches: - - master + - fr-translation jobs: test_build: @@ -14,6 +14,7 @@ jobs: runs-on: ubuntu-latest container: image: klakegg/hugo:0.111.3-ext-alpine-ci + steps: - name: Checkout code uses: actions/checkout@v3 @@ -24,10 +25,10 @@ jobs: hugo --minify deploy: - name: Deploy to Server + name: Deploy to Server (fr-translation) runs-on: ubuntu-latest needs: test_build - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/fr-translation' steps: - name: Checkout code uses: actions/checkout@v3 @@ -41,7 +42,7 @@ jobs: ssh-keyscan "$SSH_HOST" >> ~/.ssh/known_hosts chmod 644 ~/.ssh/known_hosts - ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" 'cd repo && git stash && git pull --force origin master && ./build.sh' + ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" 'cd repo-fr && git stash && git pull --force origin fr-translation && ./build.sh' env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} SSH_USER: ${{ secrets.SSH_USER }}