Skip to content

Commit

Permalink
Update the vendored BoringSSL (#93)
Browse files Browse the repository at this point in the history
* Pull in the updated BoringSSL vendoring script(s) from upstream, with a couple of tweaks (see vendor-boringssl.sh lines 124-140).

* Update vendored BoringSSL

* Bump Swift version to 5.6 to match Vapor

* The Gwynne-trademark CI bump no PR can live without
  • Loading branch information
gwynne committed Jun 2, 2023
1 parent ef12bdf commit 268cdf5
Show file tree
Hide file tree
Showing 485 changed files with 55,677 additions and 46,257 deletions.
28 changes: 4 additions & 24 deletions .github/workflows/projectboard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,7 @@ on:
types: [reopened, closed, labeled, unlabeled, assigned, unassigned]

jobs:
setup_matrix_input:
runs-on: ubuntu-latest

steps:
- id: set-matrix
run: |
output=$(curl ${{ github.event.issue.url }}/labels | jq '.[] | .name') || output=""
echo '======================'
echo 'Process incoming data'
echo '======================'
json=$(echo $output | sed 's/"\s"/","/g')
echo $json
echo "::set-output name=matrix::$(echo $json)"
outputs:
issueTags: ${{ steps.set-matrix.outputs.matrix }}

Manage_project_issues:
needs: setup_matrix_input
uses: vapor/ci/.github/workflows/issues-to-project-board.yml@main
with:
labelsJson: ${{ needs.setup_matrix_input.outputs.issueTags }}
secrets:
PROJECT_BOARD_AUTOMATION_PAT: "${{ secrets.PROJECT_BOARD_AUTOMATION_PAT }}"
update_project_boards:
name: Update project boards
uses: vapor/ci/.github/workflows/update-project-boards-for-issue.yml@reusable-workflows
secrets: inherit
35 changes: 16 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
name: test
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
on:
pull_request:
push:
branches:
- master
pull_request: { types: [opened, reopened, synchronize, ready_for_review] }
push: { branches: [ main ] }

jobs:
dependents:
linux-integration:
if: ${{ !(github.event.pull_request.draft || false) }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
dependent:
- jwt
container: swift:5.7
container: swift:5.8-jammy
steps:
- name: Check out JWTKit
uses: actions/checkout@v3
with:
path: jwt-kit
- name: Check out provider
- name: Check out JWT provider
uses: actions/checkout@v3
with:
repository: vapor/${{ matrix.dependent }}
path: dependent
repository: vapor/jwt
path: jwt
- name: Use local JWTKit
run: swift package edit jwt-kit --path ../jwt-kit
working-directory: dependent
run: swift package --package-path jwt edit jwt-kit --path ./jwt-kit
- name: Run tests with Thread Sanitizer
run: swift test --enable-test-discovery --sanitize=thread
working-directory: dependent
run: swift test --package-path jwt --sanitize=thread

unit-tests:
uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows
with:
with_coverage: false
with_coverage: true
with_tsan: true
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.4
// swift-tools-version:5.6
import PackageDescription

let package = Package(
Expand Down
Loading

0 comments on commit 268cdf5

Please sign in to comment.