Merge pull request #1801 from passagemath/ci-linux--disambiguate-logs

ci-linux.yml: Disambiguate log artifact names for 'optional', 'experimental' jobs

Author: mkoeppe

.github/workflows/ci-linux.yml

@@ -101,6 +101,7 @@ jobs:
       tox_packages_factors: >-
           ["standard"]
       docker_targets: "with-targets-optional"
+      logs_artifact_suffix: "-optional"
       extra_sage_packages: gdbm libxml2 perl_cpan_polymake_prereq perl_mongodb graphviz
       # We remove packages starting with _, in particular package _develop
       targets_optional: '$(echo $(export PATH=build/bin:$PATH && sage-package list :optional: --has-file "spkg-install.in|spkg-install|requirements.txt" --no-file "huge|has_nonfree_dependencies" | grep -v sagemath_doc | grep -v ^_))'
@@ -118,6 +119,7 @@ jobs:
       tox_packages_factors: >-
           ["standard"]
       docker_targets: "with-targets-optional"
+      logs_artifact_suffix: "-experimental"
       extra_sage_packages: gdbm libxml2 perl_cpan_polymake_prereq perl_mongodb graphviz
       targets_optional: '$(echo $(export PATH=build/bin:$PATH && sage-package list :experimental: --has-file "spkg-install.in|spkg-install|requirements.txt" --no-file "huge|has_nonfree_dependencies" | grep -v sagemath_doc))'
       max_parallel: 8

.github/workflows/docker.yml

@@ -97,6 +97,9 @@ on:
       logs_artifact:
         default: true
         type: boolean
+      logs_artifact_suffix:
+        required: false
+        type: string
       merge_ci_fixes:
         default: false
         type: boolean
@@ -155,7 +158,7 @@ jobs:
         tox_packages_factor: ${{ fromJson(inputs.tox_packages_factors) }}
     env:
       TOX_ENV:            "docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}${{ inputs.incremental && '-incremental' || '' }}"
-      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
+      LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}${{ inputs.logs_artifact_suffix  }}
       DOCKER_TARGETS:     ${{ inputs.docker_targets }}
       TARGETS_PRE:        ${{ inputs.targets_pre }}
       TARGETS:            ${{ inputs.targets }}