Changes to dependency writers and CI tests

joachimmetz · joachimmetz · commit 6ab83fd07027 · 2025-12-22T16:18:40.000+01:00
diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml
@@ -0,0 +1,23 @@
+# Run tests on Mac OS.
+name: test_macos
+on: [push, pull_request]
+permissions: read-all
+jobs:
+  test_macos:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+        - os: macos-26
+          python-version: '3.14'
+          toxenv: 'py314'
+    steps:
+    - uses: actions/checkout@v5
+    - name: Install dependencies
+      run: |
+        brew update -q
+        brew install -q gettext gnu-sed python@${{ matrix.python-version }} tox || true
+        brew link --force gettext
+    - name: Run tests
+      run: |
+        tox -e ${{ matrix.toxenv }}
diff --git a/appveyor.yml b/appveyor.yml
@@ -28,16 +28,10 @@ environment:
     PYTHON_VERSION: "3.14"
     L2TBINARIES_TRACK: "dev"
     TARGET: wheel
-  - DESCRIPTION: "Run tests on Mac OS with Python 3.14"
-    APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
-    HOMEBREW_NO_INSTALL_CLEANUP: 1
-    TARGET: tests
-    PYTHON_VERSION: "3.14"
 
 install:
 - cmd: "%PYTHON%\\python.exe -m pip install -U build pip setuptools twine wheel"
-- ps: If ($isWindows) { .\config\appveyor\install.ps1 }
-- sh: config/appveyor/install.sh
+- ps: .\config\appveyor\install.ps1
 
 build_script:
 - cmd: IF [%TARGET%]==[wheel] (
@@ -49,7 +43,6 @@ test_script:
     IF EXIST "tests\\end-to-end.py" (
         set PYTHONPATH=. &&
         "%PYTHON%\\python.exe" "tests\\end-to-end.py" --debug -c "config\\end-to-end.ini" ) )
-- sh: config/appveyor/runtests.sh
 
 artifacts:
 - path: dist\*.whl
diff --git a/config/appveyor/install.sh b/config/appveyor/install.sh
diff --git a/config/appveyor/runtests.sh b/config/appveyor/runtests.sh
diff --git a/config/docker/l2tbuilds_ubuntu.Dockerfile b/config/docker/l2tbuilds_ubuntu.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble
+FROM ubuntu:resolute
 
 # Create container with:
 # docker build -f l2tbuilds_ubuntu.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_ubuntu .
diff --git a/data/templates/appveyor.yml/deploy_script b/data/templates/appveyor.yml/deploy_script
@@ -1,4 +1,4 @@
 
 deploy_script:
-- ps: If ($$env:APPVEYOR_REPO_TAG -eq "true" -And $$isWindows -And $$env:MACHINE_TYPE -eq "x86") {
+- ps: If ($$env:APPVEYOR_REPO_TAG -eq "true" -And $$env:MACHINE_TYPE -eq "x86") {
     Invoke-Expression "$${env:PYTHON}\\python.exe -m twine upload dist/*.whl --username __token__ --password $${env:PYPI_TOKEN} --skip-existing" }
diff --git a/data/templates/appveyor.yml/install_l2tdevtools b/data/templates/appveyor.yml/install_l2tdevtools
@@ -1,2 +1 @@
-- ps: If ($$isWindows) { .\config\appveyor\install.ps1 }
-- sh: config/appveyor/install.sh
+- ps: .\config\appveyor\install.ps1
diff --git a/data/templates/appveyor.yml/matrix b/data/templates/appveyor.yml/matrix
@@ -27,8 +27,3 @@
     PYTHON_VERSION: "3.14"
     L2TBINARIES_TRACK: "dev"
     TARGET: wheel
-  - DESCRIPTION: "Run tests on Mac OS with Python 3.14"
-    APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
-    HOMEBREW_NO_INSTALL_CLEANUP: 1
-    TARGET: tests
-    PYTHON_VERSION: "3.14"
diff --git a/data/templates/appveyor.yml/test_script b/data/templates/appveyor.yml/test_script
@@ -5,4 +5,3 @@ test_script:
     IF EXIST "tests\\end-to-end.py" (
         set PYTHONPATH=. &&
         "%PYTHON%\\python.exe" "tests\\end-to-end.py" --debug -c "config\\end-to-end.ini" ) )
-- sh: config/appveyor/runtests.sh
diff --git a/data/templates/appveyor_scripts/install.sh b/data/templates/appveyor_scripts/install.sh
diff --git a/data/templates/appveyor_scripts/runtests.sh b/data/templates/appveyor_scripts/runtests.sh
diff --git a/data/templates/github_actions/test_macos.yml b/data/templates/github_actions/test_macos.yml
@@ -0,0 +1,23 @@
+# Run tests on Mac OS.
+name: test_macos
+on: [push, pull_request]
+permissions: read-all
+jobs:
+  test_macos:
+    runs-on: $${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+        - os: macos-26
+          python-version: '3.14'
+          toxenv: 'py314'
+    steps:
+    - uses: actions/checkout@v5
+    - name: Install dependencies
+      run: |
+        brew update -q
+        brew install -q gettext gnu-sed python@$${{ matrix.python-version }} tox || true
+        brew link --force gettext
+    - name: Run tests
+      run: |
+        tox -e $${{ matrix.toxenv }}
diff --git a/l2tdevtools/dependency_writers/appveyor_scripts.py b/l2tdevtools/dependency_writers/appveyor_scripts.py
@@ -29,48 +29,3 @@ def Write(self):
 
     with open(self.PATH, 'w', encoding='utf-8') as file_object:
       file_object.write(file_content)
-
-
-class AppVeyorInstallSHScriptWriter(interface.DependencyFileWriter):
-  """AppVeyor install.sh script file writer."""
-
-  _TEMPLATE_FILE = os.path.join(
-      'data', 'templates', 'appveyor_scripts', 'install.sh')
-
-  PATH = os.path.join('config', 'appveyor', 'install.sh')
-
-  def Write(self):
-    """Writes an install.sh file."""
-    dependencies = self._dependency_helper.GetL2TBinaries()
-
-    brew_packages = ['gettext', 'gnu-sed', 'python@${PYTHON_VERSION}', 'tox']
-    if 'snappy' in dependencies:
-      brew_packages.append('snappy')
-
-    template_mappings = {
-        'brew_packages': ' '.join(sorted(set(brew_packages)))
-    }
-    template_file = os.path.join(self._l2tdevtools_path, self._TEMPLATE_FILE)
-    file_content = self._GenerateFromTemplate(template_file, template_mappings)
-
-    with open(self.PATH, 'w', encoding='utf-8') as file_object:
-      file_object.write(file_content)
-
-
-class AppVeyorRuntestsSHScriptWriter(interface.DependencyFileWriter):
-  """AppVeyor runtests.sh script file writer."""
-
-  _TEMPLATE_FILE = os.path.join(
-      'data', 'templates', 'appveyor_scripts', 'runtests.sh')
-
-  PATH = os.path.join('config', 'appveyor', 'runtests.sh')
-
-  def Write(self):
-    """Writes an runtests.sh file."""
-    template_mappings = {}
-
-    template_file = os.path.join(self._l2tdevtools_path, self._TEMPLATE_FILE)
-    file_content = self._GenerateFromTemplate(template_file, template_mappings)
-
-    with open(self.PATH, 'w', encoding='utf-8') as file_object:
-      file_object.write(file_content)
diff --git a/l2tdevtools/dependency_writers/github_actions.py b/l2tdevtools/dependency_writers/github_actions.py
@@ -69,6 +69,25 @@ def Write(self):
       file_object.write(file_content)
 
 
+class GitHubActionsTestMacOSYmlWriter(interface.DependencyFileWriter):
+  """test_macos.yml GitHub actions workflow file writer."""
+
+  _TEMPLATE_FILE = os.path.join(
+      'data', 'templates', 'github_actions', 'test_macos.yml')
+
+  PATH = os.path.join('.github', 'workflows', 'test_macos.yml')
+
+  def Write(self):
+    """Writes a test_macos.yml GitHub actions workflow file ."""
+    template_mappings = {}
+
+    template_file = os.path.join(self._l2tdevtools_path, self._TEMPLATE_FILE)
+    file_content = self._GenerateFromTemplate(template_file, template_mappings)
+
+    with open(self.PATH, 'w', encoding='utf-8') as file_object:
+      file_object.write(file_content)
+
+
 class GitHubActionsTestToxYmlWriter(interface.DependencyFileWriter):
   """test_tox.yml GitHub actions workflow file writer."""
 
diff --git a/l2tdevtools/helpers/project.py b/l2tdevtools/helpers/project.py
@@ -32,7 +32,6 @@ class ProjectHelper(cli.CLIHelper):
       'acstore',
       'artifacts',
       'artifacts-kb',
-      'clitooltester',
       'dfdatetime',
       'dfkinds',
       'dfimagetools',
@@ -50,8 +49,6 @@ class ProjectHelper(cli.CLIHelper):
       'plaso',
       'plist-kb',
       'sqlite-kb',
-      'timesketch',
-      'turbinia',
       'vstools',
       'winevt-kb',
       'winreg-kb',
diff --git a/tools/update-dependencies.py b/tools/update-dependencies.py
@@ -52,10 +52,9 @@ def Main():
   for writer_class in (
       github_actions.GitHubActionsTestDockerYmlWriter,
       github_actions.GitHubActionsTestDocsYmlWriter,
+      github_actions.GitHubActionsTestMacOSYmlWriter,
       github_actions.GitHubActionsTestToxYmlWriter,
       appveyor_scripts.AppVeyorInstallPS1ScriptWriter,
-      appveyor_scripts.AppVeyorInstallSHScriptWriter,
-      appveyor_scripts.AppVeyorRuntestsSHScriptWriter,
       appveyor_yml.AppveyorYmlWriter,
       check_dependencies.CheckDependenciesWriter,
       dependencies_py.DependenciesPyWriter, dpkg.DPKGCompatWriter,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:noble`
	`1`	`+FROM ubuntu:resolute`
`2`	`2`
`3`	`3`	`# Create container with:`
`4`	`4`	`# docker build -f l2tbuilds_ubuntu.Dockerfile --force-rm --no-cache -t log2timeline/l2tbuilds_ubuntu .`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-- ps: If ($$isWindows) { .\config\appveyor\install.ps1 }`
`2`		`-- sh: config/appveyor/install.sh`
	`1`	`+- ps: .\config\appveyor\install.ps1`