From 48b88e22e36f157114b525fe15f5bd217884e992 Mon Sep 17 00:00:00 2001 From: Kyle Browning Date: Sun, 30 Jul 2023 08:03:09 -0700 Subject: [PATCH 1/3] Update to latest APNS --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 5f4a5d9..babe9ee 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ let package = Package( .library(name: "VaporAPNS", targets: ["VaporAPNS"]), ], dependencies: [ - .package(url: "https://github.com/swift-server-community/APNSwift.git", from: "5.0.0-beta.3"), + .package(url: "https://github.com/swift-server-community/APNSwift.git", from: "5.0.0"), .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"), ], targets: [ From aae94da334eddddbd40de3773720b6033bd3c7bc Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Sun, 30 Jul 2023 10:57:26 -0500 Subject: [PATCH 2/3] Require latest Vapor, update README, update all workflows, add CODEOWNERS --- .github/CODEOWNERS | 1 + .github/workflows/api-docs.yml | 2 +- .github/workflows/projectboard.yml | 28 ++++------------------------ .github/workflows/test.yml | 30 ++++++++++++------------------ Package.swift | 2 +- README.md | 21 +++++++++++++++++++++ 6 files changed, 40 insertions(+), 44 deletions(-) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..a2f01af --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @0xTim @gwynne @kylebrowning diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index 9fc247e..eb046d3 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/api-docs.yml @@ -11,4 +11,4 @@ jobs: with: package_name: apns modules: APNS - pathsToInvalidate: /apns + pathsToInvalidate: /apns/* diff --git a/.github/workflows/projectboard.yml b/.github/workflows/projectboard.yml index 0e4e66f..a0e6d98 100644 --- a/.github/workflows/projectboard.yml +++ b/.github/workflows/projectboard.yml @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa46627..bf59709 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,21 +1,15 @@ name: test +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true on: -- pull_request + pull_request: { types: [opened, reopened, synchronize, ready_for_review] } + push: { branches: [ main ] } + jobs: - focal: - container: - image: swift:5.7 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - run: swift test - test-exports: - name: Test exports - runs-on: ubuntu-latest - steps: - - name: Check out Vapor - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Build - run: swift build -Xswiftc -DBUILDING_DOCC \ No newline at end of file + unit-tests: + uses: vapor/ci/.github/workflows/run-unit-tests.yml@reusable-workflows + with: + with_coverage: true + with_tsan: false + diff --git a/Package.swift b/Package.swift index babe9ee..aa54182 100644 --- a/Package.swift +++ b/Package.swift @@ -12,7 +12,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/swift-server-community/APNSwift.git", from: "5.0.0"), - .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"), + .package(url: "https://github.com/vapor/vapor.git", from: "4.77.2"), ], targets: [ .target(name: "VaporAPNS", dependencies: [ diff --git a/README.md b/README.md index ec41ee4..002e73a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,24 @@ +

+ Vapor +
+
+ + Documentation + + + Team Chat + + + MIT License + + + CI + + + Swift 5.7 + +

+ # APNS Helpful extensions and abstractions for using [`APNSwift`](http://github.com/kylebrowning/APNSwift.git) From 56e5cf1413b7a1022876688833bf5f5161a663d8 Mon Sep 17 00:00:00 2001 From: Gwynne Raskind Date: Sun, 30 Jul 2023 11:01:57 -0500 Subject: [PATCH 3/3] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 002e73a..1820479 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- Vapor + Vapor

@@ -14,6 +14,9 @@ CI + + Test Coverage + Swift 5.7