-
Notifications
You must be signed in to change notification settings - Fork 1
216 lines (193 loc) · 8.18 KB
/
cd.yml
File metadata and controls
216 lines (193 loc) · 8.18 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
# .github/workflows/cd.yml
name: TreeMapper CD
permissions:
contents: write # Нужно для создания релиза, коммита, тега и merge
on:
workflow_dispatch:
inputs:
version:
description: 'Version to release (e.g., 1.0.0)'
required: true
publish_to_pypi:
description: 'Publish to PyPI'
required: true
default: 'false'
type: choice
options:
- 'true'
- 'false'
jobs:
# --- 1. Подготовка: Установка версии, коммит, пуш, создание релиза/тега ---
prepare-release:
name: Prepare Commit and Create GitHub Release/Tag # Название изменено для ясности
runs-on: ubuntu-latest
outputs:
version: ${{ steps.set_outputs.outputs.version }}
tag_name: ${{ steps.set_outputs.outputs.tag_name }}
commit_sha: ${{ steps.commit_push.outputs.commit_sha }} # Выводим SHA
upload_url: ${{ steps.create_release.outputs.upload_url }}
release_id: ${{ steps.create_release.outputs.id }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Set version in version.py
run: |
VERSION="${{ github.event.inputs.version }}"
echo "Setting version to $VERSION"
sed -i -E "s/__version__ = \".*\"/__version__ = \"$VERSION\"/" src/treemapper/version.py
echo "version.py content after change:"
cat src/treemapper/version.py
# ---> ИЗМЕНЕНИЕ: Коммит и PUSH только коммита, получение SHA <---
- name: Commit and Push version bump
id: commit_push # Добавляем id шагу
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
git add src/treemapper/version.py
# Коммитим только если есть изменения
if ! git diff --staged --quiet; then
git commit -m "Release version ${{ github.event.inputs.version }}"
else
echo "No changes to commit."
fi
# Получаем SHA последнего коммита (либо нового, либо существующего)
COMMIT_SHA=$(git rev-parse HEAD)
echo "Commit SHA: $COMMIT_SHA"
echo "commit_sha=$COMMIT_SHA" >> $GITHUB_OUTPUT
# Отправляем коммит в ту ветку, на которой запущен workflow
git push origin HEAD
# ---> ИЗМЕНЕНИЕ: Создание релиза И ТЕГА через action, используя SHA <---
- name: Create GitHub Release and Tag
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: v${{ github.event.inputs.version }} # Action создаст этот тег
release_name: Release ${{ github.event.inputs.version }}
commitish: ${{ steps.commit_push.outputs.commit_sha }} # <--- Используем SHA коммита
draft: false
prerelease: false
- name: Set outputs for subsequent jobs
id: set_outputs
run: |
echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
echo "tag_name=v${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
# SHA коммита уже установлен шагом commit_push
# --- 2. Сборка и загрузка ассетов для разных ОС (без изменений) ---
build-and-upload:
name: Build and Upload Assets
needs: prepare-release
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
asset_name: linux
python-version: '3.11'
- os: macos-latest
asset_name: macos
python-version: '3.11'
- os: windows-latest
asset_name: windows
python-version: '3.11'
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Code at release tag
uses: actions/checkout@v4
with:
ref: ${{ needs.prepare-release.outputs.tag_name }} # Скачиваем код по тегу (который создаст action)
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Cache pip Dependencies
uses: actions/cache@v4
id: cache-pip
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.cfg') }}
restore-keys: |
${{ runner.os }}-pip-${{ matrix.python-version }}-
${{ runner.os }}-pip-
- name: Install Dependencies (including PyInstaller)
run: |
python -m pip install --upgrade pip
pip install .[dev]
- name: Build with PyInstaller
run: |
python -m PyInstaller --clean -y --dist ./dist/${{ matrix.asset_name }} treemapper.spec
- name: Determine architecture
id: arch
shell: bash
run: |
ARCH=$(uname -m)
if [[ "${{ runner.os }}" == "Windows" ]]; then
if [[ "${{ runner.arch }}" == "X64" ]]; then ARCH="x86_64"; \
elif [[ "${{ runner.arch }}" == "ARM64" ]]; then ARCH="arm64"; \
else ARCH="unknown"; fi
elif [[ "${{ runner.os }}" == "macOS" ]] && [[ "$ARCH" == "arm64" ]]; then
echo "Detected ARM on macOS"
fi
echo "Determined ARCH: $ARCH"
echo "arch=$ARCH" >> $GITHUB_OUTPUT
- name: Upload Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.prepare-release.outputs.upload_url }}
asset_path: ./dist/${{ matrix.asset_name }}/treemapper/${{ matrix.os == 'windows-latest' && 'treemapper.exe' || 'treemapper' }}
asset_name: treemapper-${{ matrix.asset_name }}-${{ steps.arch.outputs.arch }}-v${{ needs.prepare-release.outputs.version }}${{ matrix.os == 'windows-latest' && '.exe' || '' }}
asset_content_type: application/octet-stream
# --- 3. Публикация на PyPI (без изменений) ---
publish-to-pypi:
name: Publish to PyPI
needs: [prepare-release, build-and-upload]
if: github.event.inputs.publish_to_pypi == 'true'
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/treemapper
permissions:
id-token: write
steps:
- name: Checkout Code at release tag
uses: actions/checkout@v4
with:
ref: ${{ needs.prepare-release.outputs.tag_name }}
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install build tools
run: |
python -m pip install --upgrade pip
pip install build
- name: Build sdist and wheel
run: python -m build
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
# --- 4. Обновление ветки main (без изменений) ---
update-main-branch:
name: Update main branch (Merge Tag)
needs: [prepare-release, build-and-upload]
runs-on: ubuntu-latest
# if: always() # Раскомментируйте, если нужно мержить всегда
steps:
- name: Checkout main branch
uses: actions/checkout@v4
with:
ref: main
fetch-depth: 0
- name: Merge tag into main
run: |
git config user.name github-actions[bot]
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
echo "Attempting to merge tag ${{ needs.prepare-release.outputs.tag_name }} into main"
git merge ${{ needs.prepare-release.outputs.tag_name }} --no-ff -m "Merge tag ${{ needs.prepare-release.outputs.tag_name }} into main"
git push origin main