Skip to content

Commit

Permalink
ci: use requirements.txt for ctfcli, swap linting/chals paths
Browse files Browse the repository at this point in the history
workaround for actions/setup-python#807 and simplifies Renovate

Signed-off-by: Tom Plant <[email protected]>
  • Loading branch information
pl4nty committed Mar 9, 2024
1 parent 5e998d4 commit 503594e
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 27 deletions.
9 changes: 0 additions & 9 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,5 @@
"matchCurrentVersion": "!/^0/",
"automerge": true
}
],
"customManagers": [
{
"customType": "regex",
"fileMatch": [".yml$"],
"matchStrings": [".*ctfcli==(?<currentValue>.*?)\\n"],
"depNameTemplate": "ctfcli",
"datasourceTemplate": "pypi"
}
]
}
12 changes: 5 additions & 7 deletions .github/workflows/challenges.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ on:
push:
branches:
- main
paths-ignore:
- .*/**
- .*
- LICENSE.txt
- README.md
- pages/**
paths:
- '*/**'
- '!.*/**'
- '!pages/**'
workflow_dispatch:

jobs:
Expand All @@ -29,7 +27,7 @@ jobs:

- name: Setup ctfcli
run: |
pip install ctfcli==0.1.2
pip install -r requirements.txt
mkdir .ctf
cat <<EOF > .ctf/config
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containers-azure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- name: Setup ctfcli
run: |
pip install ctfcli==0.1.2
pip install -r requirements.txt
ctf plugins install https://github.com/pl4nty/ctfcli-deploy-azure.git
mkdir .ctf
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containers-ctfd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: Setup ctfcli
run: |
pip install ctfcli==0.1.2
pip install -r requirements.txt
mkdir .ctf
cat <<EOF > .ctf/config
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/containers-kubernetes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ jobs:

- name: Setup ctfcli
run: |
pip install ctfcli==0.1.2
pip install -r requirements.txt
ctf plugins install https://github.com/pl4nty/ctfcli-deploy-kubernetes.git
curl -L https://github.com/kubernetes/kompose/releases/download/v1.32.0/kompose-linux-amd64 -o kompose
chmod +x kompose
sudo mv ./kompose /usr/local/bin/kompose
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ name: Lint challenges

on:
push:
paths-ignore:
- .*/**
- .*
- LICENSE.txt
- README.md
- pages/**
paths:
- '*/**'
- '!.*/**'
- '!pages/**'
workflow_dispatch:

jobs:
Expand All @@ -25,7 +23,8 @@ jobs:

- name: Setup ctfcli
run: |
pip install ctfcli==0.1.2
pip install -r requirements.txt
mkdir .ctf
cat <<EOF > .ctf/config
[config]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:

- name: Setup ctfcli
run: |
pip install ctfcli==0.1.2
pip install -r requirements.txt
mkdir .ctf
cat <<EOF > .ctf/config
[config]
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ctfcli==0.1.2

0 comments on commit 503594e

Please sign in to comment.