Merge branch 'poppler-data' into package_updates

opendocument-app · Jul 31, 2024 · 8c9487f · 8c9487f
2 parents ef2a7e0 + eb38887
commit 8c9487f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -111,7 +111,7 @@ jobs:
       conanfile: ${{ matrix.package.conanfile }}
       package_version: ${{ matrix.package.version }}
       build_dependencies_from_source: ${{ github.event.inputs.build_dependencies_from_source == 'true' }}
-      upload_to_artifactory: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' }}
+      artifactory_upload: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' }}
     secrets:
       ARTIFACTORY: ${{ secrets.ARTIFACTORY }}
 
@@ -130,7 +130,7 @@ jobs:
       conanfile: ${{ matrix.package.conanfile }}
       package_version: ${{ matrix.package.version }}
       build_dependencies_from_source: ${{ github.event.inputs.build_dependencies_from_source == 'true' }}
-      upload_to_artifactory: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' }}
+      artifactory_upload: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' }}
     secrets:
       ARTIFACTORY: ${{ secrets.ARTIFACTORY }}
 
@@ -149,7 +149,7 @@ jobs:
       conanfile: ${{ matrix.package.conanfile }}
       package_version: ${{ matrix.package.version }}
       build_dependencies_from_source: ${{ github.event.inputs.build_dependencies_from_source == 'true' }}
-      upload_to_artifactory: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' }}
+      artifactory_upload: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' }}
     secrets:
       ARTIFACTORY: ${{ secrets.ARTIFACTORY }}
 
@@ -168,6 +168,6 @@ jobs:
       conanfile: ${{ matrix.package.conanfile }}
       package_version: ${{ matrix.package.version }}
       build_dependencies_from_source: ${{ github.event.inputs.build_dependencies_from_source == 'true' }}
-      upload_to_artifactory: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' }}
+      artifactory_upload: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' && github.event.inputs.upload_to_artifactory == 'true' }}
     secrets:
       ARTIFACTORY: ${{ secrets.ARTIFACTORY }}
diff --git a/.github/workflows/build_inner.yml b/.github/workflows/build_inner.yml
@@ -10,7 +10,7 @@ on:
       build_dependencies_from_source:
         required: true
         type: boolean
-      upload_to_artifactory:
+      artifactory_upload:
         required: true
         type: boolean
     secrets:
@@ -56,15 +56,15 @@ jobs:
       - name: Parse build from source option
         id: build_from_source
         run: |
-          if [ ${{ inputs.build_dependencies_from_source }} == "true" ]; then
+          if [ ${{ inputs.build_dependencies_from_source == 'true' }} ]; then
             echo argument=--build=* >> $GITHUB_OUTPUT
           else
             echo argument=--build=missing >> $GITHUB_OUTPUT
           fi
 
       # No need to export local packages, if the previous build jobs in this chain already published to artifactory
       - name: Conan export all packages
-        if: inputs.upload_to_artifactory != 'true'
+        if: ${{ inputs.artifactory_upload != true }}
         run: python scripts/conan_export_all_packages.py
 
       - name: conan install
@@ -74,9 +74,9 @@ jobs:
         run: conan create ${{ inputs.conanfile }} --version ${{ inputs.package_version }} --profile:host ${{ matrix.config.host_profile }} --profile:build ubuntu
 
       - name: conan login
-        if: inputs.upload_to_artifactory == 'true'
+        if: ${{ inputs.artifactory_upload }}
         run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
 
       - name: conan upload
-        if: inputs.upload_to_artifactory == 'true'
+        if: ${{ inputs.artifactory_upload }}
         run: conan upload "*" --check --confirm --remote odr