fix[build]: modules detection

fhem · Mar 5, 2024 · 2d0c784 · 2d0c784
1 parent 3b46cb0
commit 2d0c784
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,17 +40,21 @@ jobs:
           install-modules-args: --notest
           install-modules: PPI Perl::PrereqScanner::NotQuiteLite File::Find::Rule List::MoreUtils
 
+
       - name: clone 3rdparty repositories at github
         run: | 
           mapfile -t REPO_URLS < <( scripts/get-FHEMRepositorys.sh | awk '{print $4}' && printf '\0' )
           mkdir ./3rdparty
           cd ./3rdparty
           printf "%s\n" "${REPO_URLS[@]}" | xargs -I {} -P3 sh -c 'echo "{}: $(basename $(dirname {}))/$(basename {})"; git clone "{}" "$(basename $(dirname {}))/$(basename {})"; '
 
-      - name: create cpanfile from loccal cloned 3rdparty repositories
+      - name: "create private modules filter regex"    
+        run: |
+          FHEM_MODULES=$(perl scripts/get-Packages.pl ./3rdparty ./src/fhem/trunk)"  >> $GITHUB_ENV
+
+      - name: create cpanfile from local cloned 3rdparty repositories
         run: | 
-          FHEM_MODULES=$(perl scripts/get-Packages.pl ./3rdparty)
-          scan-perl-prereqs-nqlite -save_cpanfile -suggests -private_re "^(FHEM::|Win32::|YAF|OW|RTypes|RRDs|SetExtensions|HttpUtils|UPnP::ControlPoint|FritzBoxUtils|configDB|RESIDENTStk|SHC_datafields|TcpServerUtils|Blocking|uConv|ZWLib|UpNp:Common|HttpUtils|Unit|GD|DevIo|AttrTemplate|ProtoThreads|$FHEM_MODULES)" ./3rdparty
+          scan-perl-prereqs-nqlite -save_cpanfile -suggests -private_re "^(FHEM::|Win32::|YAF$|OW$|RTypes$|RRDs$|SetExtensions$|HttpUtils$|UPnP::ControlPoint$|FritzBoxUtils$|configDB$|RESIDENTStk$|SHC_datafields$|TcpServerUtils$|Blocking$|uConv$|ZWLib$|UpNp:Common|HttpUtils$|Unit$|GD$|DevIo$|AttrTemplate$|ProtoThreads$|$FHEM_MODULES)" ./3rdparty
       
       - uses: actions/upload-artifact@v4
         with:
@@ -60,8 +64,7 @@ jobs:
 
       - name: create cpanfile from FHEM dependencies
         run: | 
-          FHEM_MODULES=$(perl scripts/get-Packages.pl ./src/fhem/trunk)
-          scan-perl-prereqs-nqlite -save_cpanfile -suggests -private_re "^(FHEM::|Win32::|YAF|OW|RTypes|RRDs|SetExtensions|HttpUtils|UPnP::ControlPoint|FritzBoxUtils|configDB|RESIDENTStk|SHC_datafields|TcpServerUtils|Blocking|uConv|ZWLib|UpNp:Common|HttpUtils|Unit|GD|DevIo|AttrTemplate|ProtoThreads|$FHEM_MODULES)" ./src/fhem/trunk
+          scan-perl-prereqs-nqlite -save_cpanfile -suggests -private_re "^(FHEM::|Win32::|YAF$|OW$|RTypes$|RRDs$|SetExtensions$|HttpUtils$|UPnP::ControlPoint$|FritzBoxUtils$|configDB$|RESIDENTStk$|SHC_datafields$|TcpServerUtils$|Blocking$|uConv$|ZWLib$|UpNp:Common|HttpUtils$|Unit$|GD$|DevIo$|AttrTemplate$|ProtoThreads$|$FHEM_MODULES)" ./src/fhem/trunk
         
       - uses: actions/upload-artifact@v4
         with:

diff --git a/scripts/get-Packages.pl b/scripts/get-Packages.pl
@@ -41,8 +41,8 @@
     }
 }
 # Paketnamen mit | getrennt ausgeben
-my $package_string = join '|', @unique_package_names;
-print "Eindeutige Paketnamen: $package_string\n";
+my $package_string = join '$|', @unique_package_names;
+print "$package_string\$";
 
 # Example:
 # FHEM_MODULES=$(./scripts/get-Packages.pl src/fhem/trunk/fhem)