diff options
| author | 2026-05-04 15:55:49 +0700 | |
|---|---|---|
| committer | 2026-05-04 15:55:49 +0700 | |
| commit | 6c91e77c8712a234090c940111ea82ed9e0cd034 (patch) | |
| tree | cb1411d0898ea7a5b5970c88831eaccd30478bc6 | |
| parent | dbd3c0f30aeb9eedae6c6ccbcafa38872722da65 (diff) | |
| parent | 38cb561f5f9048d26ac7f38176c928fd4e7f32df (diff) | |
| download | web-0.15.6.tar.gz web-0.15.6.zip | |
v0.15.6 (#36)v0.15.6
- [feat: integrate general use favicon.ico for search
engines](https://github.com/SayaAndy/saya-today-web/commit/e3601faf8e98ac39be1aa746c9e20b837d09a037)
- [ci: use ansible dev tools to speed up deploy
step](https://github.com/SayaAndy/saya-today-web/commit/e3601faf8e98ac39be1aa746c9e20b837d09a037)
- [ci: enable gha buildx
cache](https://github.com/SayaAndy/saya-today-web/pull/36/commits/38cb561f5f9048d26ac7f38176c928fd4e7f32df)
- [ci: use sha short from single
source](https://github.com/SayaAndy/saya-today-web/pull/36/commits/38cb561f5f9048d26ac7f38176c928fd4e7f32df)
- [ci: no strict host key checking in
ci](https://github.com/SayaAndy/saya-today-web/pull/36/commits/7b1aca39816f4b82ddf9c4ced83275d56e1b8780)
| -rw-r--r-- | .github/workflows/build-and-deploy-prod.yml | 31 | ||||
| -rw-r--r-- | .github/workflows/build-and-deploy-stage.yml | 43 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | static/favicon.ico | bin | 0 -> 7633 bytes | |||
| -rw-r--r-- | views/layouts/general-page.html | 5 | ||||
| -rw-r--r-- | views/pages/global-map.html | 5 | ||||
| -rw-r--r-- | views/pages/unsubscribe-page.html | 5 |
8 files changed, 75 insertions, 17 deletions
diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index 97afdf7..d33f7af 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -40,6 +40,8 @@ jobs: context: . file: ./Dockerfile push: true + cache-from: type=gha + cache-to: type=gha,mode=max tags: | ghcr.io/sayaandy/saya-today-web:latest ghcr.io/sayaandy/saya-today-web:stable @@ -50,10 +52,16 @@ jobs: runs-on: ubuntu-latest environment: Production needs: [build-and-push] + container: + image: ghcr.io/ansible/community-ansible-dev-tools:v26.4.6 + options: --user root steps: - name: Checkout uses: actions/checkout@v6 + - name: Install community.docker collection + run: ansible-galaxy collection install community.docker + - name: Set up SSH connection for uz.saya.casa run: | mkdir -p ~/.ssh @@ -67,7 +75,7 @@ jobs: - name: Test SSH connection run: | - ssh -o ConnectTimeout=10 -i ~/.ssh/id_ed25519 svc_github@uz.saya.casa "echo 'SSH connection successful'" + ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/.ssh/id_ed25519 svc_github@uz.saya.casa "echo 'SSH connection successful'" - name: Install Ansible shell: bash @@ -77,7 +85,24 @@ jobs: - name: Run Ansible playbook env: - ANSIBLE_HOST_KEY_CHECKING: False + ANSIBLE_HOST_KEY_CHECKING: "False" working-directory: ./deploy run: | - ansible-playbook -i inventory.yml -l prod playbook.yml --private-key ~/.ssh/id_ed25519 -u svc_github -e saya_today_web_auth_salt="${{ secrets.AUTH_SALT }}" -e saya_today_web_s3_access_key_id="${{ secrets.S3_ACCESS_KEY_ID }}" -e saya_today_web_s3_secret_access_key="${{ secrets.S3_SECRET_ACCESS_KEY }}" -e saya_today_web_environment=prod -e saya_today_web_tag=${{ github.ref_name }} -e saya_today_web_mail_salt="${{ secrets.MAIL_SALT }}" -e saya_today_web_mail_host="${{ secrets.MAIL_HOST }}" -e saya_today_web_mail_address="${{ secrets.MAIL_ADDRESS }}" -e saya_today_web_mail_username="${{ secrets.MAIL_USERNAME }}" -e saya_today_web_mail_password="${{ secrets.MAIL_PASSWORD }}" -e saya_today_google_site_verification="${{ secrets.GOOGLE_SITE_VERIFICATION }}" -e saya_today_yandex_verification="${{ secrets.YANDEX_VERIFICATION }}" + ansible-playbook \ + playbook.yml \ + -i inventory.yml \ + -l prod \ + --private-key ~/.ssh/id_ed25519 \ + -u svc_github \ + -e saya_today_web_auth_salt="${{ secrets.AUTH_SALT }}" \ + -e saya_today_web_s3_access_key_id="${{ secrets.S3_ACCESS_KEY_ID }}" \ + -e saya_today_web_s3_secret_access_key="${{ secrets.S3_SECRET_ACCESS_KEY }}" \ + -e saya_today_web_environment=prod \ + -e saya_today_web_tag=${{ github.ref_name }} \ + -e saya_today_web_mail_salt="${{ secrets.MAIL_SALT }}" \ + -e saya_today_web_mail_host="${{ secrets.MAIL_HOST }}" \ + -e saya_today_web_mail_address="${{ secrets.MAIL_ADDRESS }}" \ + -e saya_today_web_mail_username="${{ secrets.MAIL_USERNAME }}" \ + -e saya_today_web_mail_password="${{ secrets.MAIL_PASSWORD }}" \ + -e saya_today_google_site_verification="${{ secrets.GOOGLE_SITE_VERIFICATION }}" \ + -e saya_today_yandex_verification="${{ secrets.YANDEX_VERIFICATION }}" diff --git a/.github/workflows/build-and-deploy-stage.yml b/.github/workflows/build-and-deploy-stage.yml index ffee091..ce4a1fb 100644 --- a/.github/workflows/build-and-deploy-stage.yml +++ b/.github/workflows/build-and-deploy-stage.yml @@ -9,6 +9,8 @@ jobs: environment: Stage permissions: packages: write + outputs: + sha_short: ${{ steps.ghss_vars.outputs.sha_short }} steps: - name: Checkout uses: actions/checkout@v6 @@ -35,7 +37,7 @@ jobs: - name: Set github short sha id: ghss_vars - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + run: echo "sha_short=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT - name: Build and push uses: docker/build-push-action@v7 @@ -43,6 +45,8 @@ jobs: context: . file: ./Dockerfile push: true + cache-from: type=gha + cache-to: type=gha,mode=max tags: | ghcr.io/sayaandy/saya-today-web:latest ghcr.io/sayaandy/saya-today-web:commit-${{ steps.ghss_vars.outputs.sha_short }} @@ -52,10 +56,16 @@ jobs: runs-on: ubuntu-latest environment: Stage needs: [build-and-push] + container: + image: ghcr.io/ansible/community-ansible-dev-tools:v26.4.6 + options: --user root steps: - name: Checkout uses: actions/checkout@v6 + - name: Install community.docker collection + run: ansible-galaxy collection install community.docker + - name: Set up SSH connection for uz.saya.casa run: | mkdir -p ~/.ssh @@ -69,21 +79,26 @@ jobs: - name: Test SSH connection run: | - ssh -o ConnectTimeout=10 -i ~/.ssh/id_ed25519 svc_github@uz.saya.casa "echo 'SSH connection successful'" - - - name: Install Ansible - shell: bash - run: | - sudo apt update - sudo apt install -y ansible - - - name: Set github short sha - id: ghss_vars - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/.ssh/id_ed25519 svc_github@uz.saya.casa "echo 'SSH connection successful'" - name: Run Ansible playbook env: - ANSIBLE_HOST_KEY_CHECKING: False + ANSIBLE_HOST_KEY_CHECKING: "False" working-directory: ./deploy run: | - ansible-playbook -i inventory.yml -l stage playbook.yml --private-key ~/.ssh/id_ed25519 -u svc_github -e saya_today_web_auth_salt="${{ secrets.AUTH_SALT }}" -e saya_today_web_s3_access_key_id="${{ secrets.S3_ACCESS_KEY_ID }}" -e saya_today_web_s3_secret_access_key="${{ secrets.S3_SECRET_ACCESS_KEY }}" -e saya_today_web_environment=stage -e saya_today_web_tag=commit-${{ steps.ghss_vars.outputs.sha_short }} -e saya_today_web_mail_salt="${{ secrets.MAIL_SALT }}" -e saya_today_web_mail_host="${{ secrets.MAIL_HOST }}" -e saya_today_web_mail_address="${{ secrets.MAIL_ADDRESS }}" -e saya_today_web_mail_username="${{ secrets.MAIL_USERNAME }}" -e saya_today_web_mail_password="${{ secrets.MAIL_PASSWORD }}" + ansible-playbook \ + playbook.yml \ + -i inventory.yml \ + -l stage \ + --private-key ~/.ssh/id_ed25519 \ + -u svc_github \ + -e saya_today_web_auth_salt="${{ secrets.AUTH_SALT }}" \ + -e saya_today_web_s3_access_key_id="${{ secrets.S3_ACCESS_KEY_ID }}" \ + -e saya_today_web_s3_secret_access_key="${{ secrets.S3_SECRET_ACCESS_KEY }}" \ + -e saya_today_web_environment=stage \ + -e saya_today_web_tag=commit-${{ needs.build-and-push.outputs.sha_short }} \ + -e saya_today_web_mail_salt="${{ secrets.MAIL_SALT }}" \ + -e saya_today_web_mail_host="${{ secrets.MAIL_HOST }}" \ + -e saya_today_web_mail_address="${{ secrets.MAIL_ADDRESS }}" \ + -e saya_today_web_mail_username="${{ secrets.MAIL_USERNAME }}" \ + -e saya_today_web_mail_password="${{ secrets.MAIL_PASSWORD }}" @@ -42,3 +42,5 @@ config*.json .envrc /.ansible + +.DS_Store @@ -4,6 +4,7 @@ RUN apk add --no-cache sqlite-dev musl-dev gcc WORKDIR /builddir COPY . . +RUN go mod download RUN CGO_ENABLED=1 go build -o sayana-web . FROM alpine:3.23 AS runtime-stage diff --git a/static/favicon.ico b/static/favicon.ico Binary files differnew file mode 100644 index 0000000..99d5fbf --- /dev/null +++ b/static/favicon.ico diff --git a/views/layouts/general-page.html b/views/layouts/general-page.html index 98cbfcf..5cf870f 100644 --- a/views/layouts/general-page.html +++ b/views/layouts/general-page.html @@ -43,6 +43,11 @@ type="image/svg+xml" media="(prefers-color-scheme: dark)" /> + <link + rel="icon" + href="/favicon.ico" + type="image/x-icon" + /> {{- with .LinkedData }} <script type="application/ld+json"> {{ . }} diff --git a/views/pages/global-map.html b/views/pages/global-map.html index fe7d747..1501111 100644 --- a/views/pages/global-map.html +++ b/views/pages/global-map.html @@ -35,6 +35,11 @@ media="(prefers-color-scheme: dark)" /> <link + rel="icon" + href="/favicon.ico" + type="image/x-icon" + /> + <link rel="stylesheet" href="{{ .StaticStorageBaseUrl }}/libs/leaflet/1.9.4/leaflet.css" /> diff --git a/views/pages/unsubscribe-page.html b/views/pages/unsubscribe-page.html index a917746..9a78488 100644 --- a/views/pages/unsubscribe-page.html +++ b/views/pages/unsubscribe-page.html @@ -16,6 +16,11 @@ type="image/svg+xml" media="(prefers-color-scheme: dark)" /> + <link + rel="icon" + href="/favicon.ico" + type="image/x-icon" + /> <title>{{ .L.UnsubscribePage.Header }} // SAYA.UZ</title> <style> .bg-paper { |