diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml index edb7bc4..69921a7 100644 --- a/.forgejo/workflows/cleanup.yaml +++ b/.forgejo/workflows/cleanup.yaml @@ -11,11 +11,12 @@ jobs: - name: Environment setup run: | apk add git nodejs jq coreutils curl tree gawk grep - - name: Pages repo pull + - name: Public repo pull uses: actions/checkout@v4 with: fetch-depth: 0 - ref: pages + token: ${{ secrets.PAGES_TOKEN }} + ref: public - name: Render website run: | export GITHUB_PR_NAME=$(grep -l ${{ github.sha }} previews/*/git_sha.txt | awk -F '/' '{print $2}') diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml new file mode 100644 index 0000000..91fc4ff --- /dev/null +++ b/.forgejo/workflows/deploy.yaml @@ -0,0 +1,27 @@ +on: + push: + branches: + - 'public' + +jobs: + deploy: + runs-on: x86_64 + container: alpine:latest + env: + GIT_SSH_COMMAND: ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no + steps: + - name: Environment setup + run: | + apk add git nodejs openssh-client-common openssh-client-default + - name: Start ssh-agent + uses: actions/ssh-agent@v0.9.0 + with: + ssh-private-key: ${{ secrets.PAGES_PRIVKEY }} + - name: Repo pull + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Website upload + run: | + git remote set-url origin ${{ vars.PAGES_TARGET }} + git push -f diff --git a/.forgejo/workflows/pages.yaml b/.forgejo/workflows/pages.yaml index e37c097..5a05a58 100644 --- a/.forgejo/workflows/pages.yaml +++ b/.forgejo/workflows/pages.yaml @@ -11,27 +11,28 @@ jobs: steps: - name: Environment setup run: | - apk add git ikiwiki po4a perl-yaml-tiny tree nodejs imagemagick-perlmagick imagemagick imagemagick-jpeg findutils bash imagemagick-webp + apk add git ikiwiki po4a perl-yaml-tiny tree nodejs - name: Repo pull - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v4 with: fetch-depth: 1 - - name: Pages repo pull - uses: actions/checkout@v4 + token: ${{ secrets.PAGES_TOKEN }} + - name: Public repo pull + uses: https://github.com/actions/checkout@v4 with: fetch-depth: 0 - ref: pages + ref: public path: public + token: ${{ secrets.PAGES_TOKEN }} - name: Render website run: ikiwiki --setup ikiwiki.setup - name: Website upload run: | - cp .pages-domains public/.domains - cp .pages-redirect public/_redirects + rm -Rf public/.forgejo + mkdir -p public/.forgejo/workflows + cp .forgejo/workflows/deploy.yaml public/.forgejo/workflows/. git log -1 --pretty=%B > commit.txt cd public - find -name 'index.html' -type 'l' -delete - find -name 'index.fr.html' -exec bash -c 'ln -s "${0/.*\/}" "${0/.fr/}"' {} \; date > generated.txt # Note: the following account information will not work on GHES git config user.name "forgejo-actions[bot]" diff --git a/.forgejo/workflows/preview.yaml b/.forgejo/workflows/preview.yaml index e8ec978..3ad603e 100644 --- a/.forgejo/workflows/preview.yaml +++ b/.forgejo/workflows/preview.yaml @@ -10,18 +10,20 @@ jobs: steps: - name: Environment setup run: | - apk add git ikiwiki po4a perl-yaml-tiny tree nodejs jq coreutils curl imagemagick-perlmagick imagemagick imagemagick-jpeg findutils bash imagemagick-webp - echo "GITHUB_PR_NAME=$(curl -Ls ${{ github.server_url }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.ref_name }} -H 'accept: application/json' -H 'Authorization: token ${{ secrets.FORGEJO_TOKEN }}' | jq .title | tr ' ' '-' | tr -d ':' | tr -d '"' | tr '[:upper:]' '[:lower:]' | tr '/' '-' | tr -d ',')" >> $GITHUB_ENV + apk add git ikiwiki po4a perl-yaml-tiny tree nodejs jq coreutils curl + echo "GITHUB_PR_NAME=$(curl -Ls ${{ github.server_url }}/api/v1/repos/${{ github.repository }}/pulls/${{ github.ref_name }} | jq .title | tr ' ' '-' | tr -d ':' | tr -d '"' | tr '[:upper:]' '[:lower:]' | tr '/' '-')" >> $GITHUB_ENV - name: Repo pull uses: actions/checkout@v4 with: fetch-depth: 1 + token: ${{ secrets.PAGES_TOKEN }} - name: Public repo pull uses: actions/checkout@v4 with: fetch-depth: 0 - ref: pages + ref: public path: public + token: ${{ secrets.PAGES_TOKEN }} - name: Render website run: | rm -rf public/previews/$GITHUB_PR_NAME || true @@ -30,11 +32,11 @@ jobs: ikiwiki --setup ikiwiki.setup cd public/previews tree -d -H '.' -L 1 --noreport --charset utf-8 -T "Versions" -o index.html - cd $GITHUB_PR_NAME - find -name 'index.html' -type 'l' -delete - find -name 'index.fr.html' -exec bash -c 'ln -s "${0/.*\/}" "${0/.fr/}"' {} \; - name: Website upload run: | + rm -Rf public/.forgejo + mkdir -p public/.forgejo/workflows + cp .forgejo/workflows/deploy.yaml public/.forgejo/workflows/. git log -1 --pretty=%B > commit.txt cd public date > previews/$GITHUB_PR_NAME/generated.txt diff --git a/.pages-domains b/.pages-domains deleted file mode 100644 index fd7f80a..0000000 --- a/.pages-domains +++ /dev/null @@ -1 +0,0 @@ -www.ilot.io diff --git a/.pages-redirect b/.pages-redirect deleted file mode 100644 index e69de29..0000000 diff --git a/footer.fr.mo b/footer.fr.mo index e93d1db..17c3156 100644 Binary files a/footer.fr.mo and b/footer.fr.mo differ diff --git a/footer.fr.po b/footer.fr.po index 533e635..0a09a35 100644 --- a/footer.fr.po +++ b/footer.fr.po @@ -7,19 +7,19 @@ msgid "" msgstr "" "Project-Id-Version: ilot.io\n" -"POT-Creation-Date: 2025-06-12 16:36-0400\n" -"PO-Revision-Date: 2025-06-12 16:44-0400\n" +"POT-Creation-Date: 2024-10-09 18:45-0400\n" +"PO-Revision-Date: 2024-10-09 18:46-0400\n" "Last-Translator: \n" "Language-Team: dev@ayakael.net\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.5\n" +"X-Generator: Poedit 3.4.3\n" #. type: Content of:
Ilot is a GRIP-UQAM working group