validate, workflow: Try to get XML UTF-8 encoding declared right

aprsorg · Jun 4, 2024 · cfa77a1 · cfa77a1
1 parent 8837032
commit cfa77a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -50,7 +50,11 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
-          aws s3 sync \
-          ./build "s3://$AWS_S3_BUCKET" \
-          --region eu-west-1
+          aws s3 sync --exclude "*.xml" \
+            ./build "s3://$AWS_S3_BUCKET" \
+            --region eu-west-1
+          aws s3 cp \
+            ./build/tocalls.xml "s3://$AWS_S3_BUCKET/tocalls.xml" \
+            --content-type "application/xml; charset=utf-8" \
+            --region eu-west-1
 
diff --git a/tools/validate.pl b/tools/validate.pl
@@ -206,8 +206,8 @@ ($$$$$$$)
 
 # XML
 my $output = new IO::File(">$out_dir/tocalls.xml");
-my $xw = new XML::Writer(OUTPUT => $output);
-
+my $xw = new XML::Writer(OUTPUT => $output, ENCODING => "utf-8");
+$xw->xmlDecl();
 $xw->startTag("aprsdevices");
 
 $xw->startTag("classes");