Skip to content

Commit 7a2b838

Browse files
authored
CI: Speed improvements (#819)
- ci(codeql-analysis): Update action versions, cleanup - Move pypi upload action out into separate job dependent on tests passing, only ran on git tags
2 parents 2fafe19 + a81e7cd commit 7a2b838

File tree

3 files changed

+49
-53
lines changed

3 files changed

+49
-53
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
121
name: "CodeQL"
132

143
on:
154
push:
165
branches: [ master ]
176
pull_request:
18-
# The branches below must be a subset of the branches above
197
branches: [ master ]
208
schedule:
21-
- cron: '28 21 * * 0'
9+
- cron: '16 5 * * 2'
2210

2311
jobs:
2412
analyze:
@@ -29,42 +17,17 @@ jobs:
2917
contents: read
3018
security-events: write
3119

32-
strategy:
33-
fail-fast: false
34-
matrix:
35-
language: [ 'python' ]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37-
# Learn more about CodeQL language support at https://git.io/codeql-language-support
38-
3920
steps:
4021
- name: Checkout repository
41-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
4223

43-
# Initializes the CodeQL tools for scanning.
4424
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v1
25+
uses: github/codeql-action/init@v2
4626
with:
47-
languages: ${{ matrix.language }}
48-
# If you wish to specify custom queries, you can do so here or in a config file.
49-
# By default, queries listed here will override any specified in a config file.
50-
# Prefix the list here with "+" to use these queries and those in the config file.
51-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
27+
languages: "python"
5228

53-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
54-
# If this step fails, then you should remove it and run the build manually (see below)
5529
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v1
57-
58-
# ℹ️ Command-line programs to run using the OS shell.
59-
# 📚 https://git.io/JvXDl
60-
61-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
62-
# and modify them (or add more) to build your code if your project
63-
# uses a compiled language
64-
65-
#- run: |
66-
# make bootstrap
67-
# make release
30+
uses: github/codeql-action/autobuild@v2
6831

6932
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v1
33+
uses: github/codeql-action/analyze@v2

.github/workflows/tests.yml

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,40 @@ jobs:
7474
ls $HOME/tmux-builds/tmux-${{ matrix.tmux-version }}/bin
7575
tmux -V
7676
poetry run py.test --cov=./ --cov-report=xml
77+
7778
- uses: codecov/codecov-action@v2
7879
with:
7980
token: ${{ secrets.CODECOV_TOKEN }}
8081

81-
- name: Build package
82-
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
83-
run: poetry build
82+
release:
83+
runs-on: ubuntu-latest
84+
needs: build
85+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
8486

85-
- name: Publish package
86-
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
87-
uses: pypa/gh-action-pypi-publish@release/v1
88-
with:
89-
user: __token__
90-
password: ${{ secrets.PYPI_API_TOKEN }}
91-
skip_existing: true
87+
strategy:
88+
matrix:
89+
python-version: ["3.10"]
90+
91+
steps:
92+
- uses: actions/checkout@v3
93+
94+
- name: Install poetry
95+
run: pipx install "poetry==1.1.15"
96+
97+
- name: Set up Python ${{ matrix.python-version }}
98+
uses: actions/setup-python@v4
99+
with:
100+
python-version: ${{ matrix.python-version }}
101+
cache: 'poetry'
102+
103+
- name: Build package
104+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
105+
run: poetry build
106+
107+
- name: Publish package
108+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
109+
uses: pypa/gh-action-pypi-publish@release/v1
110+
with:
111+
user: __token__
112+
password: ${{ secrets.PYPI_API_TOKEN }}
113+
skip_existing: true

CHANGES

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force
1919

2020
- _Insert changes/features/fixes for next release here_
2121

22+
## tmuxp 1.15.1 (unreleased)
23+
24+
**Maintenance release, no features or fixes**
25+
26+
### Infrastructure
27+
28+
- CI speedups (#819)
29+
30+
- Split out release to separate job so the PyPI Upload docker image isn't pulled on normal runs
31+
- Clean up CodeQL
32+
2233
## tmuxp 1.15.0 (2022-09-11)
2334

2435
**Maintenance release, no features or fixes**

0 commit comments

Comments
 (0)