Replace references to 2.x.x with main (#396)

hummingbird-project · Mar 9, 2024 · 7ad7e0c · 7ad7e0c
1 parent 7b417de
commit 7ad7e0c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -1,4 +1,4 @@
-name: Benchmark PR vs 2.x.x
+name: Benchmark PR vs main
 
 on:
   workflow_dispatch:
@@ -47,39 +47,39 @@ jobs:
         run: |
           cd Benchmarks
           swift package --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update pull_request
-      - name: Switch to branch '2.x.x'
+      - name: Switch to branch 'main'
         if: ${{ env.hasBenchmark == '1' }}
         run: |
           git stash
-          git checkout 2.x.x
-      - name: Run benchmarks for branch '2.x.x'
+          git checkout main
+      - name: Run benchmarks for branch 'main'
         if: ${{ env.hasBenchmark == '1' }}
         run: |
           cd Benchmarks
-          swift package --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update 2.x.x
-      - name: Compare PR and 2.x.x
+          swift package --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update main
+      - name: Compare PR and main
         if: ${{ env.hasBenchmark == '1' }}
         id: benchmark
         run: |
           echo $(date) >> $GITHUB_STEP_SUMMARY
           echo "exitStatus=1" >> $GITHUB_ENV
           cd Benchmarks
-          swift package benchmark baseline check 2.x.x pull_request --format markdown >> $GITHUB_STEP_SUMMARY
+          swift package benchmark baseline check main pull_request --format markdown >> $GITHUB_STEP_SUMMARY
           echo "exitStatus=0" >> $GITHUB_ENV
         continue-on-error: true
       - if: ${{ env.exitStatus == '0' }}
         name: Pull request comment text success
         id: prtestsuccess
         run: |
           echo 'PRTEST<<EOF' >> $GITHUB_ENV
-          echo "[Pull request benchmark comparison [${{ matrix.os }}] with '2.x.x' run at $(date -Iseconds)](https://github.com/hummingbird-project/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }})" >> $GITHUB_ENV
+          echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)](https://github.com/hummingbird-project/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }})" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
       - if: ${{ env.exitStatus == '1' }}
         name: Pull request comment text failure
         id: prtestfailure
         run: |
           echo 'PRTEST<<EOF' >> $GITHUB_ENV
-          echo "[Pull request benchmark comparison [${{ matrix.os }}] with '2.x.x' run at $(date -Iseconds)](https://github.com/hummingbird-project/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }})" >> $GITHUB_ENV
+          echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)](https://github.com/hummingbird-project/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }})" >> $GITHUB_ENV
           echo "_Pull request had performance regressions_" >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
       - name: Comment PR

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
   <img src="https://img.shields.io/badge/swift-5.9-brightgreen.svg"/>
 </a>
 <a href="https://github.com/hummingbird-project/hummingbird/actions?query=workflow%3ACI">
-  <img src="https://github.com/hummingbird-project/hummingbird/actions/workflows/ci.yml/badge.svg?branch=2.x.x"/>
+  <img src="https://github.com/hummingbird-project/hummingbird/actions/workflows/ci.yml/badge.svg?branch=main"/>
 </a>
 <a href="https://discord.gg/7ME3nZ7mP2">
   <img src="https://img.shields.io/badge/chat-discord-brightgreen.svg"/>
@@ -53,13 +53,13 @@ Hummingbird is designed to require the least number of dependencies possible, bu
 
 And also the following are available in other repositories in this organisation
 
-- [`HummingbirdAuth`](https://github.com/hummingbird-project/hummingbird-auth/tree/2.x.x): Authentication framework
-- [`HummingbirdFluent`](https://github.com/hummingbird-project/hummingbird-fluent/tree/2.x.x): Integration with Vapor's database ORM [FluentKit](https://github.com/Vapor/fluent-kit).
-- [`HummingbirdLambda`](https://github.com/hummingbird-project/hummingbird-lambda/tree/2.x.x): Framework for running Hummingbird on AWS Lambdas.
+- [`HummingbirdAuth`](https://github.com/hummingbird-project/hummingbird-auth/tree/main): Authentication framework
+- [`HummingbirdFluent`](https://github.com/hummingbird-project/hummingbird-fluent/tree/main): Integration with Vapor's database ORM [FluentKit](https://github.com/Vapor/fluent-kit).
+- [`HummingbirdLambda`](https://github.com/hummingbird-project/hummingbird-lambda/tree/main): Framework for running Hummingbird on AWS Lambdas.
 - [`HummingbirdMustache`](https://github.com/hummingbird-project/hummingbird-mustache): Mustache templating engine.
-- [`HummingbirdRedis`](https://github.com/hummingbird-project/hummingbird-redis/tree/2.x.x): Redis support via [RediStack](https://github.com/swift-server/RediStack).
-- [`HummingbirdWebSocket`](https://github.com/hummingbird-project/hummingbird-websocker/tree/2.x.x): Support for WebSockets (Currently work in progess).
+- [`HummingbirdRedis`](https://github.com/hummingbird-project/hummingbird-redis/tree/main): Redis support via [RediStack](https://github.com/swift-server/RediStack).
+- [`HummingbirdWebSocket`](https://github.com/hummingbird-project/hummingbird-websocker/tree/main): Support for WebSockets (Currently work in progess).
 
 ## Documentation
 
-You can find reference documentation and user guides for Hummingbird [here](https://hummingbird-project.github.io/hummingbird-docs/2.0/documentation/hummingbird/). The [hummingbird-examples](https://github.com/hummingbird-project/hummingbird-examples/tree/2.x.x) repository has a number of examples of different uses of the library.
+You can find reference documentation and user guides for Hummingbird [here](https://hummingbird-project.github.io/hummingbird-docs/2.0/documentation/hummingbird/). The [hummingbird-examples](https://github.com/hummingbird-project/hummingbird-examples/tree/main) repository has a number of examples of different uses of the library.
diff --git a/scripts/generate-contributors-list.sh b/scripts/generate-contributors-list.sh
@@ -16,7 +16,7 @@
 #set -eux
 here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 CONTRIBUTORS=""
-BRANCH="2.x.x"
+BRANCH="main"
 
 embed_newline()
 {

diff --git a/scripts/test-builds.sh b/scripts/test-builds.sh
@@ -27,11 +27,11 @@ verify_repository()
 }
 
 # Test latest code against
-verify_repository test https://github.com/hummingbird-project/hummingbird-auth 2.x.x
-#verify_repository test https://github.com/hummingbird-project/hummingbird-compression 2.x.x
-verify_repository build https://github.com/hummingbird-project/hummingbird-fluent 2.x.x
-verify_repository build https://github.com/hummingbird-project/hummingbird-lambda 2.x.x
-verify_repository build https://github.com/hummingbird-project/hummingbird-redis 2.x.x
-#verify_repository test https://github.com/hummingbird-project/hummingbird-websocket 2.x.x
+verify_repository test https://github.com/hummingbird-project/hummingbird-auth main
+#verify_repository test https://github.com/hummingbird-project/hummingbird-compression main
+verify_repository build https://github.com/hummingbird-project/hummingbird-fluent main
+verify_repository build https://github.com/hummingbird-project/hummingbird-lambda main
+verify_repository build https://github.com/hummingbird-project/hummingbird-redis main
+#verify_repository test https://github.com/hummingbird-project/hummingbird-websocket main
 
 rm -rf $TEMP_DIR