diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml index 0c00bf0..a29e2e8 100644 --- a/.github/workflows/publish-docker-image.yml +++ b/.github/workflows/publish-docker-image.yml @@ -8,25 +8,23 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: olegtarasov/get-tag@v2.1 - id: get-tag + - uses: actions/checkout@v4 - name: Build image - run: docker build . -t epicwink/seddy:${{ steps.get-tag.outputs.tag }} + run: docker build . -t epicwink/seddy:${{ github.ref_name }} - name: Login to DockerHub run: > echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login --password-stdin -u epicwink - name: Publish image - run: docker push epicwink/seddy:${{ steps.get-tag.outputs.tag }} + run: docker push epicwink/seddy:${{ github.ref_name }} - name: Check tag id: check-tag run: | - if [[ ${{ steps.get-tag.outputs.tag }} =~ ^v\d+\.\d+\.\d+$ ]]; then + if [[ "${{ github.ref_name }}" =~ '^v\d+\.\d+\.\d+$' ]]; then echo ::set-output name=match::true fi - name: Publish latest image if: steps.check-tag.outputs.match == 'true' run: | - docker tag epicwink/seddy:${{ steps.get-tag.outputs.tag }} epicwink/seddy:latest + docker tag epicwink/seddy:${{ github.ref_name }} epicwink/seddy:latest docker push epicwink/seddy:latest diff --git a/.github/workflows/publish-python-package.yml b/.github/workflows/publish-python-package.yml index 8af8d3f..fbd3ae7 100644 --- a/.github/workflows/publish-python-package.yml +++ b/.github/workflows/publish-python-package.yml @@ -7,21 +7,21 @@ on: jobs: release: runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/seddy + permissions: + id-token: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 - name: Update pip run: pip install -U pip - name: Build package run: | apt-get update && apt-get install -y git pip install build - python -m build --sdist --wheel . + python -m build --outdir dist . - name: Publish package - env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: | - pip install twine - twine upload dist/* + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/test-python-package.yml b/.github/workflows/test-python-package.yml index 018e6c6..ac2fe09 100644 --- a/.github/workflows/test-python-package.yml +++ b/.github/workflows/test-python-package.yml @@ -13,14 +13,21 @@ on: jobs: test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + os: [ubuntu-latest] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] + include: + - os: ubuntu-20.04 + python-version: '3.6' + - os: ubuntu-22.04 + python-version: '3.7' + steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Update pip