Issue #3617: don't specify the cpanfile

rather move cpanfile.snapshot and hope that App::cpm does the right thing
RotherOSS · Jul 20, 2024 · c93fd2c · c93fd2c
1 parent 54e48ac
commit c93fd2c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/.github/workflows/cache_local_lib.yml b/.github/workflows/cache_local_lib.yml
@@ -75,6 +75,28 @@ jobs:
               if: steps.cache_local_lib.outputs.cache-hit != 'true'
               run: apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install libxml2-utils libxslt-dev graphviz libqrencode-dev odbcinst1debian2 libodbc1 odbcinst unixodbc-dev unixodbc
 
+            - name: 'install App::perlimports from CPAN'
+              if: steps.cache_local_lib.outputs.cache-hit != 'true'
+              uses: perl-actions/install-with-cpm@stable
+              with:
+                install: |
+                  App::perlimports
+                global: false
+                tests: false
+                sudo: false
+
+            - name: 'move cpanfile.snapshot in place'
+              if: steps.cache_local_lib.outputs.cache-hit != 'true'
+              run: cp cpanfile.docker.snapshot cpanfile.snapshot
+
+            - name: 'install Perl modules from CPAN'
+              if: steps.cache_local_lib.outputs.cache-hit != 'true'
+              uses: perl-actions/install-with-cpm@stable
+              with:
+                global: false
+                tests: false
+                sudo: false
+
             - name: 'install Perl modules from CPAN'
               if: steps.cache_local_lib.outputs.cache-hit != 'true'
               uses: perl-actions/install-with-cpm@stable

diff --git a/.github/workflows/code_policy.yml b/.github/workflows/code_policy.yml
@@ -63,13 +63,24 @@ jobs:
             #     sudo apt install -y cpanminus
             #     cpanm -l local --notest XML::LibXSLT || sh -xc 'cat ~/.cpanm/work/*/build.log'
 
-            - name: 'install Perl modules from CPAN'
+            - name: 'install App::perlimports from CPAN'
               if: steps.cache_local_lib.outputs.cache-hit != 'true'
               uses: perl-actions/install-with-cpm@stable
               with:
                 install: |
                   App::perlimports
-                cpanfile: cpanfile.docker.snapshot
+                global: false
+                tests: false
+                sudo: false
+
+            - name: 'move cpanfile.snapshot in place'
+              if: steps.cache_local_lib.outputs.cache-hit != 'true'
+              run: cp cpanfile.docker.snapshot cpanfile.snapshot
+
+            - name: 'install Perl modules from CPAN'
+              if: steps.cache_local_lib.outputs.cache-hit != 'true'
+              uses: perl-actions/install-with-cpm@stable
+              with:
                 global: false
                 tests: false
                 sudo: false