You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2023/01/12 06:31:56 UTC
svn commit: r1906628 - in /spamassassin/trunk/.github: actions/setup_macos_for_sa_test/action.yml actions/setup_windows_for_sa_test/ actions/setup_windows_for_sa_test/action.yml workflows/spamassassin_make_test.yml
Author: sidney
Date: Thu Jan 12 06:31:56 2023
New Revision: 1906628
URL: http://svn.apache.org/viewvc?rev=1906628&view=rev
Log:
Bug 8056 - Add install of pyzor to macOS and Windows test runners on GitHub
Added:
spamassassin/trunk/.github/actions/setup_windows_for_sa_test/
spamassassin/trunk/.github/actions/setup_windows_for_sa_test/action.yml
Modified:
spamassassin/trunk/.github/actions/setup_macos_for_sa_test/action.yml
spamassassin/trunk/.github/workflows/spamassassin_make_test.yml
Modified: spamassassin/trunk/.github/actions/setup_macos_for_sa_test/action.yml
URL: http://svn.apache.org/viewvc/spamassassin/trunk/.github/actions/setup_macos_for_sa_test/action.yml?rev=1906628&r1=1906627&r2=1906628&view=diff
==============================================================================
--- spamassassin/trunk/.github/actions/setup_macos_for_sa_test/action.yml (original)
+++ spamassassin/trunk/.github/actions/setup_macos_for_sa_test/action.yml Thu Jan 12 06:31:56 2023
@@ -32,7 +32,6 @@ runs:
make
sudo make install
- pip3 install git+https://github.com/SpamExperts/pyzor.git
-
+ python3 -m pip install https://github.com/SpamExperts/pyzor/archive/refs/heads/master.zip
+ ln -s `which pyzor` /usr/local/bin/pyzor
shell: bash
-
Added: spamassassin/trunk/.github/actions/setup_windows_for_sa_test/action.yml
URL: http://svn.apache.org/viewvc/spamassassin/trunk/.github/actions/setup_windows_for_sa_test/action.yml?rev=1906628&view=auto
==============================================================================
--- spamassassin/trunk/.github/actions/setup_windows_for_sa_test/action.yml (added)
+++ spamassassin/trunk/.github/actions/setup_windows_for_sa_test/action.yml Thu Jan 12 06:31:56 2023
@@ -0,0 +1,16 @@
+name: 'Setup Windows for SpamAssassin build and test'
+description: 'Setup Windows runner for SpamAssassin build and test'
+runs:
+ using: 'composite'
+ steps:
+ - name: install pyzor
+ run: |
+ python -m pip install "https://github.com/SpamExperts/pyzor/archive/refs/heads/master.zip"
+ export PYSCRIPT=`which pyzor`
+ export PYSCRIPTW=`cmd '/c where pyzor'`
+ export PYBINW=`cmd '/c where python'`
+ export PYBASE=$(dirname $PYBINW)
+ mkdir -p "$PYBASE/etc"
+ echo "@$PYBINW $PYSCRIPTW --homedir $PYBASE\etc\pyzor %1 %2 %3 %4 %5 %6 %7 %8 %9" > $PYSCRIPT.bat
+ cat "$PYSCRIPT.bat"
+ shell: bash
Modified: spamassassin/trunk/.github/workflows/spamassassin_make_test.yml
URL: http://svn.apache.org/viewvc/spamassassin/trunk/.github/workflows/spamassassin_make_test.yml?rev=1906628&r1=1906627&r2=1906628&view=diff
==============================================================================
--- spamassassin/trunk/.github/workflows/spamassassin_make_test.yml (original)
+++ spamassassin/trunk/.github/workflows/spamassassin_make_test.yml Thu Jan 12 06:31:56 2023
@@ -61,6 +61,10 @@ jobs:
if: ${{ startsWith( matrix.runner, 'macos-' ) }}
uses: ./.github/actions/setup_macos_for_sa_test
+ - name: Install requirements for Windows
+ if: ${{ startsWith( matrix.runner, 'windows-' ) }}
+ uses: ./.github/actions/setup_windows_for_sa_test
+
- name: Set up perl
uses: shogo82148/actions-setup-perl@v1
id: perl