Skip to content

Commit

Permalink
upgrade to libsodium 1.0.20-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
reaperhulk committed Jun 4, 2024
1 parent 6004abe commit 791ac0f
Show file tree
Hide file tree
Showing 230 changed files with 18,282 additions and 9,858 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wheel-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
architecture: ${{ matrix.WINDOWS.ARCH }}
- name: Extract libsodium libraries
run: |
Expand-Archive src/libsodium-1.0.18-stable-msvc.zip -DestinationPath c:\
Expand-Archive src/libsodium-1.0.20-stable-msvc.zip -DestinationPath c:\
shell: powershell
- name: Add sodium to paths
run: |
Expand Down
6 changes: 0 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,7 @@ def run(self):
# Ensure all of our executable files have their permission set
for filename in [
"src/libsodium/autogen.sh",
"src/libsodium/compile",
"src/libsodium/configure",
"src/libsodium/depcomp",
"src/libsodium/install-sh",
"src/libsodium/missing",
"src/libsodium/msvc-scripts/process.bat",
"src/libsodium/test/default/wintest.bat",
]:
os.chmod(here(filename), 0o755)

Expand Down
Binary file not shown.
68 changes: 61 additions & 7 deletions src/libsodium/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ jobs:
tcc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Update packages list
run: sudo apt-get update

- name: Install dependencies
run: sudo apt-get install -y build-essential libtool autoconf automake tcc
run: |
sudo apt-get install -y build-essential libtool autoconf automake tcc
- name: Autogen
run: ./autogen.sh -s
Expand All @@ -31,10 +32,39 @@ jobs:
make uninstall
make distclean
zig:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Update packages list
run: sudo apt-get update

- name: Install Zig
uses: goto-bus-stop/setup-zig@d866436887ad1b24590684f9d00480376663dd36
with:
version: 0.12.0

- name: Autogen
run: ./autogen.sh -s

- name: Compilation with zig
run: |
zig build
zig build -Dtarget=x86_64-linux
zig build -Dtarget=aarch64-linux
zig build -Dtarget=x86_64-windows
zig build -Dtarget=aarch64-windows
zig build -Dtarget=x86_64-macos
zig build -Dtarget=aarch64-macos
zig build -Dtarget=wasm32-wasi
zig build -Doptimize=ReleaseFast
rm -fr zig-cache zig-out
regular:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Update packages list
run: sudo apt-get update
Expand Down Expand Up @@ -63,7 +93,7 @@ jobs:
check-globals:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Update packages list
run: sudo apt-get update
Expand All @@ -81,7 +111,7 @@ jobs:
other-comp:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Update packages list
run: sudo apt-get update
Expand All @@ -107,13 +137,13 @@ jobs:
other-arch:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Update packages list
run: sudo apt-get update

- name: Install dependencies
run: sudo apt-get install -y build-essential libtool autoconf automake qemu-user-static gcc-powerpc-linux-gnu
run: sudo apt-get install -y build-essential libtool autoconf automake gcc-powerpc-linux-gnu

- name: Autogen
run: ./autogen.sh -s
Expand All @@ -123,3 +153,27 @@ jobs:
env CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking --host=powerpc-linux-gnu
make -j $(nproc)
make clean > /dev/null
android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Update packages list
run: sudo apt-get update

- name: Install base dependencies
run: sudo apt-get install -y libtool autoconf automake unzip

- name: Autogen
run: ./autogen.sh -s

- name: Install Android NDK
run: |
mkdir /tmp/android && cd /tmp/android
curl -o ndk.zip -L https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
unzip ndk.zip && rm -f *.zip && mv android-ndk* ndk
- name: Android compilation
run: |
env ANDROID_NDK_HOME=/tmp/android/ndk ./dist-build/android-aar.sh
31 changes: 15 additions & 16 deletions src/libsodium/.github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,27 @@ on:
push:
pull_request:
schedule:
- cron: '0 17 * * 2'
- cron: "0 17 * * 2"

jobs:
CodeQL-Build:

runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 2
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 2

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: cpp
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: cpp

- run: |
./autogen.sh -s
env CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking
make -j $(nproc) check
- run: |
./autogen.sh -s
env CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking
make -j $(nproc) check
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
Loading

0 comments on commit 791ac0f

Please sign in to comment.