WIP

MISP · Aug 24, 2024 · bc74247 · bc74247
1 parent a01aa15
commit bc74247
Show file tree

Hide file tree

Showing 5 changed files with 292 additions and 253 deletions.
diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml
@@ -18,14 +18,14 @@ jobs:
  - name: Install packages
  run: sudo apt-get install libpoppler-cpp-dev libzbar0 tesseract-ocr yara
 
- - name: Install poetry
- run: pipx install poetry
-
  - name: Set up Python 3.12
  uses: actions/setup-python@v5
  with:
  python-version: 3.12
 
+ - name: Install poetry
+ run: python -m pip install poetry
+
  - name: Install dependencies
  run: poetry install --with docs
 
@@ -49,37 +49,42 @@ jobs:
  name: python-package-distributions
  path: dist/
 
+ publish-to-pypi:
+ runs-on: ubuntu-latest
+ needs: build
+
+ permissions:
+ id-token: write
+
+ steps:
+ - name: Download dist files
+ uses: actions/download-artifact@v3
+ with:
+ name: python-package-distributions
+ path: dist/
+
+ - name: Publish to PyPI
+ uses: pypa/gh-action-pypi-publish@release/v1
+ with:
+ skip-existing: true
+ verbose: true
+ repository-url: https://test.pypi.org/legacy/
+
+ deploy-gh-pages:
+ runs-on: ubuntu-latest
+ needs: build
+
+ permissions:
+ pages: write
+ id-token: write
+
+ environment:
+ name: github-pages
+ url: ${{ steps.deployment.outputs.page_url }}
+
+ steps:
+ - name: Deploy to GitHub Pages
+ id: deployment
+ uses: actions/deploy-pages@v2
+
 
-# publish-to-pypi:
-# runs-on: ubuntu-latest
-# needs: build
-# 
-# steps:
-# - name: Download dist files
-# uses: actions/download-artifact@v3
-# with:
-# name: python-package-distributions
-# path: dist/
-# 
-# - name: Publish to PyPI
-# uses: pypa/gh-action-pypi-publish@release/v1
-# # with:
-# # repository-url: https://test.pypi.org/legacy/
-# 
-# 
-# deploy-gh-pages:
-# runs-on: ubuntu-latest
-# needs: build
-# 
-# permissions:
-# pages: write
-# id-token: write
-# 
-# environment:
-# name: github-pages
-# url: ${{ steps.deployment.outputs.page_url }}
-# 
-# steps:
-# - name: Deploy to GitHub Pages
-# id: deployment
-# uses: actions/deploy-pages@v2
diff --git a/.github/workflows/test-package.yml b/.github/workflows/test-package.yml
@@ -21,15 +21,15 @@ jobs:
  - name: Install packages
  run: sudo apt-get install libpoppler-cpp-dev libzbar0 tesseract-ocr yara
 
- - name: Install poetry
- run: pipx install poetry
-
  - name: Set up Python 3.12
  uses: actions/setup-python@v5
  with:
  python-version: 3.12
  cache: 'poetry'
 
+ - name: Install poetry
+ run: python -m pip install poetry
+
  - name: Install dependencies
  run: poetry install --with docs
 
@@ -51,16 +51,16 @@ jobs:
 
  - name: Install packages
  run: sudo apt-get install libpoppler-cpp-dev libzbar0 tesseract-ocr yara
-
- - name: Install poetry
- run: pipx install poetry
 
  - name: Set up Python ${{ matrix.python-version }}
  uses: actions/setup-python@v5
  with:
  python-version: ${{ matrix.python-version }}
  cache: 'poetry'
 
+ - name: Install poetry
+ run: python -m pip install poetry
+
  - name: Install dependencies
  run: poetry install --with test
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # MISP modules
 
-[![Build status](https://github.com/MISP/misp-modules/actions/workflows/python-package.yml/badge.svg)](https://github.com/MISP/misp-modules/actions/workflows/python-package.yml)[![Coverage Status](https://coveralls.io/repos/github/MISP/misp-modules/badge.svg?branch=main)](https://coveralls.io/github/MISP/misp-modules?branch=main)
+[![Build status](https://github.com/MISP/misp-modules/actions/workflows/python-package.yml/badge.svg)](https://github.com/MISP/misp-modules/actions/workflows/test-package.yml)[![Coverage Status](https://coveralls.io/repos/github/MISP/misp-modules/badge.svg?branch=main)](https://coveralls.io/github/MISP/misp-modules?branch=main)
 [![codecov](https://codecov.io/gh/MISP/misp-modules/branch/main/graph/badge.svg)](https://codecov.io/gh/MISP/misp-modules)
 
 MISP modules are autonomous modules that can be used to extend [MISP](https://github.com/MISP/MISP) for new services such as expansion, import, export and workflow action.