Dev

.github/workflows/actionlint.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v7.0.1
 
       - name: actionlint
-        uses: reviewdog/action-actionlint@v1.73.0
+        uses: reviewdog/action-actionlint@v1.73.4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           reporter: github-pr-review

.github/workflows/ci.yml

@@ -5,6 +5,8 @@ on:
     paths:
       - 'Dockerfile'
       - '*/src/**'
+      - 'assets/**'
+      - 'rust-toolchain'
       - 'Cargo.toml'
       - 'Cargo.lock'
       - '.github/workflows/ci.yml'
@@ -38,23 +40,7 @@ jobs:
           winget install --id=Google.Protobuf -l C:\protobuf --exact --accept-package-agreements --accept-source-agreements
           echo C:\protobuf\bin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-          # depName=rustfs/cli
-          $env:RUSTFS_CLI_VERSION="v0.1.30"
-          $env:RUSTFS_CLI_ZIP_NAME="rustfs-cli-windows-amd64-$env:RUSTFS_CLI_VERSION.zip"
-          Invoke-WebRequest "https://github.com/rustfs/cli/releases/download/$env:RUSTFS_CLI_VERSION/$env:RUSTFS_CLI_ZIP_NAME" -OutFile "$env:RUSTFS_CLI_ZIP_NAME"
-          Expand-Archive -Path "$env:RUSTFS_CLI_ZIP_NAME" -DestinationPath C:\Windows\
-          Remove-Item -Path "$env:RUSTFS_CLI_ZIP_NAME"
-
-      - name: Prepare Map
-        shell: C:\shells\gitbash.exe {0}
-        run: |
-          rc alias set yr32srv https://rustfs-s3.yr32.net eewbot-ci "${{ secrets.YR32RUSTFS_EEWBOT_CI_SECRET }}"
-          pushd assets/shapefile/
-          rc cp yr32srv/eewbot/shapefiles_v1.zip ./shapefiles_v1.zip
-          7z x ./shapefiles_v1.zip -y
-          popd
-
-      - uses: Swatinem/rust-cache@v2.9.1
+      - uses: Swatinem/rust-cache@v2.9.2
         with:
           prefix-key: ${{ env.RUST_CACHE_VERSION }}-rust
 
@@ -83,12 +69,13 @@ jobs:
           mkdir "$DIR_NAME"
           cp ./target/release/renderer.exe "$DIR_NAME/"
           cp ./LICENSE "$DIR_NAME/"
+          cp ./THIRD_PARTY_NOTICES.md "$DIR_NAME/"
           cp ./CREDITS "$DIR_NAME/"
           cp ./README.md "$DIR_NAME/"
           7z a "$DIR_NAME.zip" "$DIR_NAME/"
 
       - name: pre-release
-        uses: softprops/action-gh-release@v3.0.2
+        uses: softprops/action-gh-release@v3.0.3
         if: "! startsWith(github.ref, 'refs/tags/')"
         with:
           tag_name: master-${{ github.sha }}
@@ -98,7 +85,7 @@ jobs:
             *.zip
 
       - name: tagged-release
-        uses: softprops/action-gh-release@v3.0.2
+        uses: softprops/action-gh-release@v3.0.3
         if: startsWith(github.ref, 'refs/tags/')
         with:
           fail_on_unmatched_files: true
@@ -113,11 +100,9 @@ jobs:
       matrix:
         include:
           - ghimage: ubuntu-24.04
-            rustfscliarch: amd64
             arch_s: x86_64
 
           - ghimage: ubuntu-24.04-arm
-            rustfscliarch: arm64
             arch_s: aarch64
 
     permissions:
@@ -130,28 +115,16 @@ jobs:
         with:
           submodules: true
 
-      - run: |
-          # depName=rustfs/cli
-          RUSTFS_CLI_VERSION="v0.1.30"
-          RUSTFS_CLI_TAR_NAME="rustfs-cli-linux-${{ matrix.rustfscliarch }}-$RUSTFS_CLI_VERSION.tar.gz"
-          wget "https://github.com/rustfs/cli/releases/download/$RUSTFS_CLI_VERSION/$RUSTFS_CLI_TAR_NAME"
-          tar xf "$RUSTFS_CLI_TAR_NAME"
-          rm "$RUSTFS_CLI_TAR_NAME"
-          sudo mv rc /bin/
-
-          rc alias set yr32srv https://rustfs-s3.yr32.net eewbot-ci "${{ secrets.YR32RUSTFS_EEWBOT_CI_SECRET }}"
-          pushd assets/shapefile/
-          rc cp yr32srv/eewbot/shapefiles_v1.zip ./shapefiles_v1.zip
-          unzip -o ./shapefiles_v1.zip
-          popd
+      - name: Install Toolchains
+        run: |
           sudo apt-get update -y
           sudo apt-get install -y protobuf-compiler
 
       - name: Install cargo license
         run: |
           cargo install cargo-license
 
-      - uses: Swatinem/rust-cache@v2.9.1
+      - uses: Swatinem/rust-cache@v2.9.2
         with:
           prefix-key: ${{ env.RUST_CACHE_VERSION }}-rust
 
@@ -174,12 +147,13 @@ jobs:
           mkdir "$DIR_NAME"
           cp ./target/release/renderer "$DIR_NAME/"
           cp ./LICENSE "$DIR_NAME/"
+          cp ./THIRD_PARTY_NOTICES.md "$DIR_NAME/"
           cp ./CREDITS "$DIR_NAME/"
           cp ./README.md "$DIR_NAME/"
           tar cvf "$DIR_NAME.tar.gz" "$DIR_NAME/"
 
       - name: pre-release
-        uses: softprops/action-gh-release@v3.0.2
+        uses: softprops/action-gh-release@v3.0.3
         if: "! startsWith(github.ref, 'refs/tags/')"
         with:
           tag_name: master-${{ github.sha }}
@@ -189,7 +163,7 @@ jobs:
             *.tar.gz
 
       - name: tagged-release
-        uses: softprops/action-gh-release@v3.0.2
+        uses: softprops/action-gh-release@v3.0.3
         if: startsWith(github.ref, 'refs/tags/')
         with:
           fail_on_unmatched_files: true
@@ -205,11 +179,9 @@ jobs:
         include:
           - ghimage: ubuntu-24.04
             dockerarch: linux/amd64
-            rustfscliarch: amd64
 
           - ghimage: ubuntu-24.04-arm
             dockerarch: linux/arm64
-            rustfscliarch: arm64
 
     permissions:
       packages: write
@@ -224,20 +196,8 @@ jobs:
         with:
           submodules: true
 
-      - run: |
-          # depName=rustfs/cli
-          RUSTFS_CLI_VERSION="v0.1.30"
-          RUSTFS_CLI_TAR_NAME="rustfs-cli-linux-${{ matrix.rustfscliarch }}-$RUSTFS_CLI_VERSION.tar.gz"
-          wget "https://github.com/rustfs/cli/releases/download/$RUSTFS_CLI_VERSION/$RUSTFS_CLI_TAR_NAME"
-          tar xf "$RUSTFS_CLI_TAR_NAME"
-          rm "$RUSTFS_CLI_TAR_NAME"
-          sudo mv rc /bin/
-
-          rc alias set yr32srv https://rustfs-s3.yr32.net eewbot-ci "${{ secrets.YR32RUSTFS_EEWBOT_CI_SECRET }}"
-          pushd assets/shapefile/
-          rc cp yr32srv/eewbot/shapefiles_v1.zip ./shapefiles_v1.zip
-          unzip -o ./shapefiles_v1.zip
-          popd
+      - name: Install Toolchains
+        run: |
           sudo apt-get update -y
           sudo apt-get install -y protobuf-compiler
 
@@ -252,7 +212,7 @@ jobs:
           toolchain: ${{ steps.toolchain.outputs.toolchain }}
           components: clippy
 
-      - uses: Swatinem/rust-cache@v2.9.1
+      - uses: Swatinem/rust-cache@v2.9.2
         with:
           prefix-key: ${{ env.RUST_CACHE_VERSION }}-rust
 
@@ -274,12 +234,10 @@ jobs:
         include:
           - ghimage: ubuntu-24.04
             dockerarch: linux/amd64
-            rustfscliarch: amd64
             arch_short: amd64
 
           - ghimage: ubuntu-24.04-arm
             dockerarch: linux/arm64
-            rustfscliarch: arm64
             arch_short: arm64
 
     permissions:
@@ -295,20 +253,8 @@ jobs:
         with:
           submodules: true
 
-      - run: |
-          # depName=rustfs/cli
-          RUSTFS_CLI_VERSION="v0.1.30"
-          RUSTFS_CLI_TAR_NAME="rustfs-cli-linux-${{ matrix.rustfscliarch }}-$RUSTFS_CLI_VERSION.tar.gz"
-          wget "https://github.com/rustfs/cli/releases/download/$RUSTFS_CLI_VERSION/$RUSTFS_CLI_TAR_NAME"
-          tar xf "$RUSTFS_CLI_TAR_NAME"
-          rm "$RUSTFS_CLI_TAR_NAME"
-          sudo mv rc /bin/
-
-          rc alias set yr32srv https://rustfs-s3.yr32.net eewbot-ci "${{ secrets.YR32RUSTFS_EEWBOT_CI_SECRET }}"
-          pushd assets/shapefile/
-          rc cp yr32srv/eewbot/shapefiles_v1.zip ./shapefiles_v1.zip
-          unzip -o ./shapefiles_v1.zip
-          popd
+      - name: Install Toolchains
+        run: |
           sudo apt-get update -y
           sudo apt-get install -y protobuf-compiler
 
@@ -324,7 +270,7 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
 
-      - uses: docker/setup-buildx-action@v4.2.0
+      - uses: docker/setup-buildx-action@v4.3.0
 
       - uses: docker/login-action@v4.6.0
         with:
@@ -378,7 +324,7 @@ jobs:
           pattern: digests-*
           merge-multiple: true
 
-      - uses: docker/setup-buildx-action@v4.2.0
+      - uses: docker/setup-buildx-action@v4.3.0
 
       - uses: docker/metadata-action@v6.2.0
         id: meta

.github/workflows/rendering.yml

@@ -4,6 +4,8 @@ on:
   pull_request:
     paths:
       - '*/src/**'
+      - 'assets/**'
+      - 'rust-toolchain'
       - 'Cargo.toml'
       - 'Cargo.lock'
       - '.github/workflows/rendering.yml'
@@ -22,35 +24,20 @@ jobs:
 
       - name: prepare dependencies
         run: |
-          sudo apt-get update -y && sudo apt-get install -y xvfb protobuf-compiler libxkbcommon-x11-dev
-
-      - run: |
-          # depName=rustfs/cli
-          RUSTFS_CLI_VERSION="v0.1.30"
-          RUSTFS_CLI_TAR_NAME="rustfs-cli-linux-amd64-$RUSTFS_CLI_VERSION.tar.gz"
-          wget "https://github.com/rustfs/cli/releases/download/$RUSTFS_CLI_VERSION/$RUSTFS_CLI_TAR_NAME"
-          tar xf "$RUSTFS_CLI_TAR_NAME"
-          rm "$RUSTFS_CLI_TAR_NAME"
-          sudo mv rc /bin/
-
-          rc alias set yr32srv https://rustfs-s3.yr32.net eewbot-ci "${{ secrets.YR32RUSTFS_EEWBOT_CI_SECRET }}"
-          pushd assets/shapefile/
-          rc cp yr32srv/eewbot/shapefiles_v1.zip ./shapefiles_v1.zip
-          unzip -o ./shapefiles_v1.zip
-          popd
+          sudo apt-get update -y && sudo apt-get install -y protobuf-compiler libegl1
 
       - name: Get Rust toolchain
         id: toolchain
         run: |
           awk -F'[ ="]+' '$1 == "channel" { print "toolchain=" $2 }' rust-toolchain >> "$GITHUB_OUTPUT"
 
       - name: cache dependencies
-        uses: Swatinem/rust-cache@v2.9.1
+        uses: Swatinem/rust-cache@v2.9.2
 
       - name: install eew-renderer-url
         run: |
           # depName=EEWBot/eew-renderer-url
-          EEW_RENDERER_URL_VERSION="v0.1.0"
+          EEW_RENDERER_URL_VERSION="v0.2.0"
           TAR_NAME="eew-renderer-url-linux-x86_64-$EEW_RENDERER_URL_VERSION.tar.gz"
           wget "https://github.com/EEWBot/eew-renderer-url/releases/download/$EEW_RENDERER_URL_VERSION/$TAR_NAME"
           tar xf $TAR_NAME
@@ -62,9 +49,7 @@ jobs:
 
       - name: rendering
         run: |
-          Xvfb :0 -listen tcp -ac -screen 0 1024x768x24 &
-          sleep 1;
-          DISPLAY=:0 cargo run --release &
+          HEADLESS=true cargo run --release &
           sleep 3;
           mkdir images
 

.github/workflows/review.yml

@@ -4,6 +4,8 @@ on:
   pull_request:
     paths:
       - '*/src/**'
+      - 'rust-toolchain'
+      - 'assets/**'
       - 'Cargo.toml'
       - 'Cargo.lock'
       - '.github/workflows/review.yml'
@@ -18,11 +20,9 @@ jobs:
         include:
           - ghimage: ubuntu-24.04
             dockerarch: linux/amd64
-            rustfscliarch: amd64
 
           - ghimage: ubuntu-24.04-arm
             dockerarch: linux/arm64
-            rustfscliarch: arm64
 
     permissions:
       packages: write
@@ -37,20 +37,8 @@ jobs:
         with:
           submodules: true
 
-      - run: |
-          # depName=rustfs/cli
-          RUSTFS_CLI_VERSION="v0.1.30"
-          RUSTFS_CLI_TAR_NAME="rustfs-cli-linux-${{ matrix.rustfscliarch }}-$RUSTFS_CLI_VERSION.tar.gz"
-          wget "https://github.com/rustfs/cli/releases/download/$RUSTFS_CLI_VERSION/$RUSTFS_CLI_TAR_NAME"
-          tar xf "$RUSTFS_CLI_TAR_NAME"
-          rm "$RUSTFS_CLI_TAR_NAME"
-          sudo mv rc /bin/
-
-          rc alias set yr32srv https://rustfs-s3.yr32.net eewbot-ci "${{ secrets.YR32RUSTFS_EEWBOT_CI_SECRET }}"
-          pushd assets/shapefile/
-          rc cp yr32srv/eewbot/shapefiles_v1.zip ./shapefiles_v1.zip
-          unzip -o ./shapefiles_v1.zip
-          popd
+      - name: Install Toolchains
+        run: |
           sudo apt-get update -y
           sudo apt-get install -y protobuf-compiler
 
@@ -66,7 +54,7 @@ jobs:
           components: clippy
 
       - name: cache dependencies
-        uses: Swatinem/rust-cache@v2.9.1
+        uses: Swatinem/rust-cache@v2.9.2
 
       - name: clippy check
         uses: yanorei32/action-clippy@50412b135153ebee7d4b8a5b868c4defdc663683

.gitignore

@@ -6,11 +6,11 @@
 
 /target/
 
-*.dbf
-*.shp
-*.shx
+# QGIS layer metadata sidecar file
 *.qmd
+# QGIS coordinate reference system metadata
 *.prj
+
 screenshot*.png
 log.txt
 *.log