Better s3cmd content type fix

opengisch · Jul 23, 2023 · 73225d3 · 73225d3
1 parent 7e545dc
commit 73225d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -144,8 +144,8 @@ jobs:
             echo "${{ secrets.S3CFG }}" > ~/.s3cfg
             envsubst < ${{ github.workspace }}/platform/ios/installation-template.html > qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.html
             envsubst < ${{ github.workspace }}/platform/ios/installation-template.plist > qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.plist
-            s3cmd put --acl-public --add-header=content-type:text/html qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.html s3://qfieldapks/ci-builds/qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.html
-            s3cmd put --acl-public --add-header=content-type:application/xml qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.pList s3://qfieldapks/ci-builds/qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.pList
+            s3cmd put --acl-public -m 'text/html' qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.html s3://qfieldapks/ci-builds/qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.html
+            s3cmd put --acl-public -m 'application/xml' qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.pList s3://qfieldapks/ci-builds/qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.pList
             s3cmd put --acl-public qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.ipa s3://qfieldapks/ci-builds/qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.ipa
 
             echo "Install the ipa from https://sos-ch-dk-2.exo.io/qfieldapks/ci-builds/qfield-${{ env.CI_PACKAGE_FILE_SUFFIX }}.html"

diff --git a/scripts/ci/upload_artifacts.sh b/scripts/ci/upload_artifacts.sh
@@ -20,7 +20,7 @@ then
 
   mv ${CMAKE_BUILD_DIR}/src/app/android-build/build/outputs/apk/release/android-build-release-signed.apk /tmp/${FILENAME_APK}
   echo "${S3CFG}" > ~/.s3cfg
-  s3cmd put --acl-public --add-header=content-type:application/vnd.android.package-archive /tmp/${FILENAME_APK} s3://qfieldapks/ci-builds/${FILENAME_APK}
+  s3cmd put --acl-public -m 'application/vnd.android.package-archive' /tmp/${FILENAME_APK} s3://qfieldapks/ci-builds/${FILENAME_APK}
   echo -e "\e[31mUploaded to https://sos-ch-dk-2.exo.io/qfieldapks/ci-builds/${FILENAME_APK} \e[0m"
   rm ~/.s3cfg
 else