Skip to content

Commit

Permalink
CI: Update docker action versions (#198)
Browse files Browse the repository at this point in the history
Signed-off-by: cyc60 <[email protected]>
  • Loading branch information
cyc60 authored Oct 11, 2023
1 parent d7693e8 commit cb8273c
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 34 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.10.10

# Install poetry
- name: Load cached Poetry installation
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.local
key: poetry-0
Expand Down Expand Up @@ -53,16 +53,16 @@ jobs:
ENVIRONMENT: test
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.10.10

# Install poetry
- name: Load cached Poetry installation
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.local
key: poetry-0
Expand Down Expand Up @@ -91,16 +91,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.10.10

# Install poetry
- name: Load cached Poetry installation
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.local
key: poetry-0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
type=ref,event=tag
type=sha
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3
- name: Login to GAR
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: europe-west4-docker.pkg.dev
username: _json_key
password: ${{ secrets.GAR_JSON_KEY }}
- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,19 @@ jobs:
certUtil -hashfile $ZIP_FILE_NAME SHA256 | findstr /i /v "SHA256" | findstr /i /v "CertUtil" > $CHECKSUM_FILE_NAME_PASH
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.PYTHON_VERSION }}

- name: Install Poetry
uses: Gr1N/setup-poetry@v8
uses: snok/install-poetry@v1
with:
poetry-version: "1.3.2"
version: 1.6.1
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true

- name: Install dependencies
run: poetry install --no-interaction --no-root
Expand All @@ -83,7 +86,7 @@ jobs:
run: ${{ matrix.BUILD_CMD }}

- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.OS }}
path: /tmp/artifacts/*
Expand All @@ -94,7 +97,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download all artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: /tmp/artifacts

Expand Down
22 changes: 6 additions & 16 deletions operator.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,19 @@
from PyInstaller.utils.hooks import collect_data_files
from sys import platform

if platform == "linux" or platform == "linux2":
datas = [
('src/common/abi/*', 'src/common/abi/'),
('src/common/word_lists/*', 'src/common/word_lists/'),
('./pyproject.toml', '.'),
('./GIT_SHA', '.'),
]
else:
datas = [
('src/common/abi/*', 'src/common/abi/'),
('src/common/word_lists/*', 'src/common/word_lists/'),
('./pyproject.toml', '.'),
('./GIT_SHA', '.')
]
datas = [
('src/common/abi/*', 'src/common/abi/'),
('src/common/word_lists/*', 'src/common/word_lists/'),
('./pyproject.toml', '.'),
('./GIT_SHA', '.'),
]

datas += collect_data_files('certifi')
datas += collect_data_files('coincurve')
datas += collect_data_files('eth_account')


block_cipher = None


a = Analysis(
['src/main.py'],
pathex=[],
Expand Down

0 comments on commit cb8273c

Please sign in to comment.