Skip to content

Commit 9743473

Browse files
authored
CI: Speed improvements (#383)
- 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 4992673 + b9f9800 commit 9743473

File tree

3 files changed

+34
-43
lines changed

3 files changed

+34
-43
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: '20 12 * * 4'
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: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,27 @@ jobs:
4040
with:
4141
token: ${{ secrets.CODECOV_TOKEN }}
4242

43+
release:
44+
runs-on: ubuntu-latest
45+
needs: build
46+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
47+
48+
strategy:
49+
matrix:
50+
python-version: ["3.10"]
51+
52+
steps:
53+
- uses: actions/checkout@v3
54+
55+
- name: Install poetry
56+
run: pipx install "poetry==1.1.15"
57+
58+
- name: Set up Python ${{ matrix.python-version }}
59+
uses: actions/setup-python@v4
60+
with:
61+
python-version: ${{ matrix.python-version }}
62+
cache: 'poetry'
63+
4364
- name: Build package
4465
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
4566
run: poetry build

CHANGES

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ $ pipx install --suffix=@next 'vcspull' --pip-args '\--pre' --force
4040

4141
- Fix cloning of mercurial repositories
4242

43+
### Infrastructure
44+
45+
- CI speedups (#383)
46+
47+
- Split out release to separate job so the PyPI Upload docker image isn't pulled on normal runs
48+
- Clean up CodeQL
49+
4350
## vcspull 1.12.3 (2022-06-01)
4451

4552
### Bug fixes

0 commit comments

Comments
 (0)