Skip to content

Commit 9af33d9

Browse files
committed
Merge branch 'dev' into interactive
2 parents c359571 + 61804b1 commit 9af33d9

File tree

710 files changed

+28834
-4200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

710 files changed

+28834
-4200
lines changed

.coveragerc

-12
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You should see `[DEBUG]` statements that show what's happening behind the scenes
3939

4040
## Verify on Ubuntu
4141

42-
If possible, please verify that your issue occurs on 64-bit Ubuntu 18.04. We provide a Dockerfile based on Ubuntu 18.04 via `docker.io` to make this super simple, no VM required!
42+
If possible, please verify that your issue occurs on 64-bit Ubuntu 22.04. We provide a Dockerfile based on Ubuntu 22.04 via `docker.io` to make this super simple, no VM required!
4343

4444
```sh
4545
# Download the Docker image

.github/dependabot.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
# Check for updates to GitHub Actions every week
8+
interval: "weekly"

.github/workflows/android.yml

+24-14
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,21 @@ jobs:
66
android-test:
77
strategy:
88
matrix:
9-
python-version: [3.8]
9+
python-version: ['3.10']
1010
os: [ubuntu-latest]
1111
runs-on: ${{ matrix.os }}
1212
timeout-minutes: 30
1313
steps:
14-
- uses: actions/checkout@v2
15-
16-
- name: Cache for pip
17-
uses: actions/cache@v1
18-
id: cache-pip
19-
with:
20-
path: ~/.cache/pip
21-
key: ${{ matrix.os }}-cache-pip
14+
- uses: actions/checkout@v4
2215

2316
- name: Set up Python ${{ matrix.python-version }}
24-
uses: actions/setup-python@v1
17+
uses: actions/setup-python@v5
2518
with:
2619
python-version: ${{ matrix.python-version }}
20+
cache: 'pip'
21+
cache-dependency-path: |
22+
**/pyproject.toml
23+
**/requirements*.txt
2724
2825
- name: Install Linux dependencies
2926
run: |
@@ -33,14 +30,27 @@ jobs:
3330
qemu-user-static \
3431
binutils-aarch64-linux-gnu \
3532
binutils-arm-linux-gnueabihf \
36-
libc6-dbg \
37-
openjdk-8-jre-headless
33+
libc6-dbg
34+
35+
- name: Cache for avd
36+
uses: actions/cache@v4
37+
id: cache-avd
38+
with:
39+
path: |
40+
~/.android
41+
/usr/local/lib/android/sdk/emulator
42+
/usr/local/lib/android/sdk/platform-tools
43+
/usr/local/lib/android/sdk/system-images
44+
key: ${{ matrix.os }}-cache-avd-${{ hashFiles('travis/setup_avd*.sh') }}
45+
restore-keys: |
46+
${{ matrix.os }}-cache-avd-
3847
3948
- name: Install Android AVD
4049
run: |
41-
USER=travis source travis/setup_avd.sh
50+
sudo usermod -aG kvm $USER
51+
source travis/setup_avd_fast.sh
4252
sed -i 's/skip_android = True/skip_android = False/' docs/source/conf.py
43-
set | egrep '^(ANDROID|PATH)' >.android.env
53+
set | grep ^PATH >.android.env
4454
4555
- name: Install dependencies
4656
run: |

.github/workflows/changelog.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: Changelog
2-
on: [pull_request]
2+
on:
3+
pull_request:
4+
paths:
5+
- pwnlib/**
6+
- pwn/**
37
env:
48
GITHUB_BASE: origin/${{ github.event.pull_request.base.ref }}
59

@@ -11,7 +15,7 @@ jobs:
1115
runs-on: ${{ matrix.os }}
1216
timeout-minutes: 5
1317
steps:
14-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1519
with:
1620
fetch-depth: 0
1721

0 commit comments

Comments
 (0)