Merge tag '4.3.0'

Android aab file upload and parse and locale support

.github/workflows/publish_release.yml

@@ -19,55 +19,32 @@ jobs:
     - name: Get the version
       id: version
       run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10})
-    - name: Publish to Github Hub Registry using tag version
+    - name: Publish to Github Hub Registry
       uses: elgohr/Publish-Docker-Github-Action@master
       env:
         REPLACE_CHINA_MIRROR: false
         VCS_REF: ${{ github.sha }}
         BUILD_DATE: ${{ steps.date.outputs.date }}
         TAG: ${{ steps.version.outputs.tag }}
       with:
-        name: ghcr.io/tryzealot/zealot:${{ env.TAG }}
+        name: ghcr.io/tryzealot/zealot
         username: ${{ github.actor }}
         password: ${{ secrets.CR_PAT }}
+        tags: "latest,${{ env.TAG }}"
         buildargs: BUILD_DATE,VCS_REF,TAG,REPLACE_CHINA_MIRROR
         registry: ghcr.io
-    - name: Publish to Github Hub Registry using latest version
+    - name: Publish to Docker Registry
       uses: elgohr/Publish-Docker-Github-Action@master
       env:
         REPLACE_CHINA_MIRROR: false
         VCS_REF: ${{ github.sha }}
         BUILD_DATE: ${{ steps.date.outputs.date }}
         TAG: ${{ steps.version.outputs.tag }}
       with:
-        name: ghcr.io/tryzealot/zealot:latest
-        username: ${{ github.actor }}
-        password: ${{ secrets.CR_PAT }}
-        buildargs: BUILD_DATE,VCS_REF,TAG,REPLACE_CHINA_MIRROR
-        registry: ghcr.io
-    - name: Publish to Docker Registry using tag version
-      uses: elgohr/Publish-Docker-Github-Action@master
-      env:
-        REPLACE_CHINA_MIRROR: false
-        VCS_REF: ${{ github.sha }}
-        BUILD_DATE: ${{ steps.date.outputs.date }}
-        TAG: ${{ steps.version.outputs.tag }}
-      with:
-        name: tryzealot/zealot:${{ env.TAG }}
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        buildargs: BUILD_DATE,VCS_REF,TAG,REPLACE_CHINA_MIRROR
-    - name: Publish to Docker Registry using latest tag
-      uses: elgohr/Publish-Docker-Github-Action@master
-      env:
-        REPLACE_CHINA_MIRROR: false
-        VCS_REF: ${{ github.sha }}
-        BUILD_DATE: ${{ steps.date.outputs.date }}
-        TAG: ${{ steps.version.outputs.tag }}
-      with:
-        name: tryzealot/zealot:latest
+        name: tryzealot/zealot
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
+        tags: "latest,${{ env.TAG }}"
         buildargs: BUILD_DATE,VCS_REF,TAG,REPLACE_CHINA_MIRROR
     - name: Update Docker Hub Description
       uses: peter-evans/[email protected]

Aptfile

@@ -0,0 +1,2 @@
+libwebp-dev
+webp

Dockerfile

@@ -1,7 +1,7 @@
 FROM ruby:2.7-alpine as builder
 
 ARG BUILD_PACKAGES="build-base libxml2 libxslt git"
-ARG DEV_PACKAGES="libxml2-dev libxslt-dev yaml-dev postgresql-dev nodejs npm yarn"
+ARG DEV_PACKAGES="libxml2-dev libxslt-dev yaml-dev postgresql-dev nodejs npm yarn libwebp-dev libpng-dev tiff-dev"
 ARG RUBY_PACKAGES="tzdata"
 
 ARG REPLACE_CHINA_MIRROR="true"
@@ -61,12 +61,12 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG TAG
 
-ARG ZEALOT_VERSION="4.2.2"
+ARG ZEALOT_VERSION="4.3.0"
 ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"
 ARG RUBYGEMS_SOURCE="https://gems.ruby-china.com/"
-ARG PACKAGES="tzdata curl logrotate postgresql-dev postgresql-client openssl openssl-dev caddy"
+ARG PACKAGES="tzdata curl logrotate postgresql-dev libwebp-dev libpng-dev tiff-dev postgresql-client openssl openssl-dev caddy"
 ARG RUBY_GEMS="bundler"
 ARG APP_ROOT=/app
 ARG S6_OVERLAY_VERSION="2.2.0.3"
@@ -86,6 +86,7 @@ ENV TZ="Asia/Shanghai" \
     BUNDLE_APP_CONFIG="$APP_ROOT/.bundle" \
     ZEALOT_VCS_REF="$VCS_REF" \
     ZEALOT_VERSION="$ZEALOT_VERSION" \
+    ZEALOT_BUILD_DATE="$BUILD_DATE" \
     RAILS_ENV="production"
 
 # System dependencies

Gemfile

@@ -11,11 +11,14 @@ gem 'rake', '~> 13.0.4'
 
 # DB & Cache
 gem 'pg', '>= 0.18', '< 2.0'
-gem 'redis', '~> 4.4.0'
+gem 'redis', '~> 4.5.1'
+
+# Logger
+gem 'lograge', '~> 0.11.2'
 
 # API
 gem 'active_model_serializers', '~> 0.10.12'
-gem 'graphql', '~> 1.12.14'
+gem 'graphql', '~> 1.13.0'
 gem 'rack-cors', '~> 1.1.1'
 gem 'health_check', '~> 3.1.0'
 
@@ -34,14 +37,15 @@ gem 'friendly_id', '~> 5.4.2'
 gem 'kaminari'
 ## 文件上传
 gem 'carrierwave', '~> 2.2.2'
+gem 'webp-ffi', '~> 0.3.1'
 
 # Helper
 ## HTTP 请求
 gem 'http', '~> 5.0.4'
 ## 用户认证
 gem 'pundit', '~> 2.1.0'
 gem 'devise', '~> 4.8.0'
-gem 'devise-i18n', '~> 1.9.4'
+gem 'devise-i18n', '~> 1.10.1'
 
 gem 'omniauth', '~> 1.9'
 gem 'omniauth-google-oauth2', '~> 0.8.2'
@@ -50,11 +54,11 @@ gem 'omniauth-feishu', '~> 0.1.6'
 gem 'omniauth-gitlab', '~> 2.0.0'
 
 ## UDID
-gem 'openssl', '~> 2.2.0'
+gem 'openssl', '~> 2.2.1'
 gem 'plist', '~> 3.6.0'
 
 ## 系统信息
-gem 'sys-filesystem', '~> 1.4.2'
+gem 'sys-filesystem', '~> 1.4.3'
 gem 'vmstat', '~> 2.3.0'
 gem 'pghero'
 gem 'active_analytics'
@@ -72,17 +76,18 @@ gem 'rqrcode'
 
 # 异步队列
 gem 'activejob-status'
-gem 'sidekiq', '~> 6.2.1'
+gem 'sidekiq', '~> 6.3.1'
 gem 'sidekiq-scheduler', '~> 3.1.0'
+gem 'sidekiq-failures', '~> 1.0.1'
 
 # Assets
 gem 'turbolinks', '~> 5'
 gem 'webpacker', '~> 5.4'
 
-# 用于解析 ipa 和 apk 包
-gem 'app-info', '~> 2.6.5'
+# 用于解析 iOS, Android 和 macOS 应用
+gem 'app-info', '~> 2.7.0'
 
-# Mobile config
+# 带缓存的配置库
 gem 'rails-settings-cached', '~> 2.8.1'
 
 # Reduces boot times through caching; required in config/boot.rb
@@ -92,10 +97,11 @@ group :development do
   # 调试控制台
   gem 'listen', '>= 3.0.5', '< 3.8'
   gem 'web-console', '>= 3.3.0'
+  gem 'graphiql-rails'
 
   # 调试器
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
-  gem 'guard', '~> 2.17.0'
+  gem 'guard', '~> 2.18.0'
   gem 'guard-bundler'
   gem 'guard-migrate'
   gem 'guard-rails'
@@ -119,7 +125,7 @@ group :development do
 
   # 在线查看 Action Mailer 内容
   gem 'letter_opener', '~> 1.7'
-  gem 'letter_opener_web', '~> 1.4'
+  gem 'letter_opener_web', '~> 2.0'
 end
 
 group :development, :test do
@@ -130,7 +136,4 @@ group :development, :test do
   gem 'pry-byebug'
   gem 'pry-rails'
   gem 'pry-rescue'
-end
-
-# docker 部署无需此 gem
-# gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
+end