Skip to content

ci: fix download artifact vulnerability #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions .github/workflows/packing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
pull_request_target:
types: [labeled]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
pack_pip:
# We want to run on external PRs, but not on our own internal
Expand Down Expand Up @@ -43,7 +47,7 @@ jobs:
run: make pip-dist-check

- name: Archive pip artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.4.0
with:
name: pip_dist
path: pip_dist
Expand Down Expand Up @@ -84,7 +88,7 @@ jobs:
tarantool-version: '2.11'

- name: Download pip package artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.8
with:
name: pip_dist
path: pip_dist
Expand Down Expand Up @@ -134,7 +138,7 @@ jobs:
run: python3 .github/scripts/remove_source_code.py

- name: Download pip package artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.8
with:
name: pip_dist
path: pip_dist
Expand Down Expand Up @@ -202,7 +206,7 @@ jobs:
run: pip3 install twine

- name: Download pip package artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.8
with:
name: pip_dist
path: pip_dist
Expand Down Expand Up @@ -271,7 +275,7 @@ jobs:
run: make rpm-dist-check

- name: Archive RPM artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.4.0
with:
name: rpm_dist_${{ matrix.target.os }}_${{ matrix.target.dist }}
path: rpm_dist
Expand Down Expand Up @@ -320,11 +324,11 @@ jobs:

- name: Install tarantool
run: |
curl -L https://tarantool.io/yeohchA/release/2/installer.sh | bash
curl -L https://tarantool.io/release/2/installer.sh | bash
dnf install -y tarantool tarantool-devel

- name: Download RPM artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.8
with:
name: rpm_dist_${{ matrix.target.os }}_${{ matrix.target.dist }}
path: rpm_dist
Expand Down Expand Up @@ -372,7 +376,7 @@ jobs:
run: sudo apt install -y curl make

- name: Download RPM artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.8
with:
name: rpm_dist_${{ matrix.target.os }}_${{ matrix.target.dist }}
path: rpm_dist
Expand Down Expand Up @@ -433,7 +437,7 @@ jobs:
run: make deb-dist-check

- name: Archive deb artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.4.0
with:
name: deb_dist
path: deb_dist
Expand Down Expand Up @@ -484,13 +488,13 @@ jobs:
- name: Install tarantool ${{ matrix.tarantool }}
run: |
apt install -y curl
curl -L https://tarantool.io/yeohchA/release/2/installer.sh | bash
curl -L https://tarantool.io/release/2/installer.sh | bash
apt install -y tarantool tarantool-dev
env:
DEBIAN_FRONTEND: noninteractive

- name: Download deb artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.8
with:
name: deb_dist
path: deb_dist
Expand Down Expand Up @@ -542,7 +546,7 @@ jobs:
run: sudo apt install -y curl make

- name: Download deb artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.8
with:
name: deb_dist
path: deb_dist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
repository: ${{ github.repository_owner }}/tarantool-python

- name: Download the tarantool build artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v4.1.8
with:
name: ${{ inputs.artifact_name }}

Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
pull_request_target:
types: [labeled]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
run_tests_ce_linux:
# We want to run on external PRs, but not on our own internal
Expand All @@ -29,7 +33,6 @@ jobs:
- '2.11'
- 'master'
python:
- '3.6'
- '3.7'
- '3.8'
- '3.9'
Expand Down Expand Up @@ -153,7 +156,7 @@ jobs:
path: 'release/linux/x86_64/2.10/'
- bundle: 'sdk-gc64-2.11.0-0-r563.linux.x86_64'
path: 'release/linux/x86_64/2.11/'
python: ['3.6', '3.11']
python: ['3.7', '3.11']

steps:
- name: Clone the connector
Expand Down Expand Up @@ -221,7 +224,7 @@ jobs:
tarantool:
- '2.11'
python:
- '3.6'
- '3.7'
- '3.11'
steps:
- name: Clone the connector repo
Expand Down Expand Up @@ -274,7 +277,7 @@ jobs:
tarantool:
- '2.11.0.g247a9a418-1'
python:
- '3.6'
- '3.7'
- '3.11'

steps:
Expand Down Expand Up @@ -344,7 +347,7 @@ jobs:
tarantool:
- '2.11.0.g247a9a418-1'
python:
- '3.6'
- '3.7'
- '3.11'
steps:
- name: Clone the connector repo
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

### Changed
- Drop Python 3.6 support (PR #327).

## 1.2.0 - 2024-03-27

### Added
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
msgpack
pytz
dataclasses; python_version <= '3.6'
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import codecs
import os

from setuptools import setup, find_packages
from setuptools import find_packages, setup
from setuptools.command.build_py import build_py

# Extra commands for documentation management
Expand Down Expand Up @@ -112,7 +112,7 @@ def get_dependencies(filename):
command_options=command_options,
install_requires=get_dependencies('requirements.txt'),
setup_requires=[
'setuptools_scm==6.4.2',
'setuptools_scm==7.1.0',
],
python_requires='>=3.6',
python_requires='>=3.7',
)
Loading