Merge branch 'release/0.15.0'

nwtgck · Dec 10, 2022 · 7b24015 · 7b24015
2 parents 865b585 + 75bb818
commit 7b24015
Show file tree

Hide file tree

Showing 12 changed files with 289 additions and 243 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -5,4 +5,3 @@
 /target
 /README.md
 /Dockerfile
-/heroku.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -20,3 +20,11 @@ updates:
   - nwtgck
   assignees:
   - nwtgck
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    timezone: Asia/Tokyo
+  open-pull-requests-limit: 99
+  reviewers: [ nwtgck ]
+  assignees: [ nwtgck ]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,33 +1,33 @@
 name: CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   cargo_fmt:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: cargo fmt --all -- --check
 
   cargo_test:
     strategy:
       matrix:
         runs-on:
           - ubuntu-20.04
-          - macOS-10.15
+          - macOS-11
     runs-on: ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: cargo test -- --color=always --nocapture
 
   # MSRV (minimum supported Rust version)
   cargo_test_msrv:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.59
+        toolchain: 1.60.0
         override: true
     - run: cargo test -- --color=always --nocapture
 
@@ -52,9 +52,9 @@ jobs:
           - x86_64-unknown-linux-musl
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install cross
-        run: cd /tmp && curl -L https://github.com/cross-rs/cross/releases/download/v0.2.2/cross-x86_64-unknown-linux-musl.tar.gz | tar xzf -
+        run: cd /tmp && curl -L https://github.com/cross-rs/cross/releases/download/v0.2.4/cross-x86_64-unknown-linux-musl.tar.gz | tar xzf -
       - run: /tmp/cross build --target=${{ matrix.target }} --release --locked
       - name: Archive binary
         run: |
@@ -67,7 +67,7 @@ jobs:
             cp ./target/${{ matrix.target }}/release/piping-server ./piping-server-${{ matrix.target }}
             tar zcf ./piping-server-${{ matrix.target }}.tar.gz ./piping-server-${{ matrix.target }}
           fi
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: cross_build_artifact
           path: |
@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Download the artifact (cross build)
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: cross_build_artifact
     - name: Extract binary
@@ -116,7 +116,9 @@ jobs:
 
         # HTTP/2 support
         (echo hello | curl -ksST- https://localhost:8443/mypath3 -o /dev/null -w '%{http_version}:%{http_code}\n' > /tmp/http2_post.txt) &
+        post_pid=$!
         diff <(echo '2:200') <(curl -ksS https://localhost:8443/mypath3 -o /dev/null -w '%{http_version}:%{http_code}\n')
+        wait $post_pid
         diff <(echo '2:200') /tmp/http2_post.txt
 
         # Transfer data using multipart
@@ -135,7 +137,7 @@ jobs:
           - aarch64-apple-darwin
     runs-on: macOS-11
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: rustup target add ${{ matrix.target }}
     - run: cargo build --target=${{ matrix.target }} --release --locked
     - name: Archive binary
@@ -144,7 +146,7 @@ jobs:
         mkdir ./piping-server-${{ matrix.target }}
         cp ./target/${{ matrix.target }}/release/piping-server ./piping-server-${{ matrix.target }}
         tar zcf ./piping-server-${{ matrix.target }}.tar.gz ./piping-server-${{ matrix.target }}
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: mac_build_artifact
         path: |
@@ -153,7 +155,7 @@ jobs:
   docker:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: docker build -t piping-server-rust .
     - name: Operational test with Docker image
       run: |
@@ -187,7 +189,9 @@ jobs:
 
         # HTTP/2 support
         (echo hello | curl -ksST- https://localhost:8443/mypath3 -o /dev/null -w '%{http_version}:%{http_code}\n' > /tmp/http2_post.txt) &
+        post_pid=$!
         diff <(echo '2:200') <(curl -ksS https://localhost:8443/mypath3 -o /dev/null -w '%{http_version}:%{http_code}\n')
+        wait $post_pid
         diff <(echo '2:200') /tmp/http2_post.txt
 
         # Transfer data using multipart
@@ -202,6 +206,14 @@ jobs:
         docker logs piping
         # Delete container
         docker rm -f piping
+    - name: Push if branch is develop
+      if: github.ref == 'refs/heads/develop'
+      run: |
+        set -eu
+        echo ${{ secrets.DOCKER_HUB_TOKEN }} | docker login -u nwtgck --password-stdin
+        GIT_BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}
+        docker tag piping-server-rust nwtgck/piping-server-rust:${GIT_BRANCH}
+        docker push nwtgck/piping-server-rust:${GIT_BRANCH}
 
   release_if_tag_exits:
     needs:
@@ -212,12 +224,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Download the artifact (cross build)
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: cross_build_artifact
         path: ./publish_dir
     - name: Download the artifact (macOS)
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: mac_build_artifact
         path: ./publish_dir
@@ -233,9 +245,3 @@ jobs:
         REPO=$(echo $GITHUB_REPOSITORY | cut -d / -f 2)
         curl -L https://github.com/tcnksm/ghr/releases/download/v0.14.0/ghr_v0.14.0_linux_amd64.tar.gz | tar xzf -
         ./ghr_v0.14.0_linux_amd64/ghr -t ${{ secrets.GITHUB_TOKEN }} -u ${GITHUB_ACTOR} -r ${REPO} -c ${GITHUB_SHA} -delete ${VERSION} ./publish_dir
-
-  heroku_docker_build:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - run: docker build -t piping-server-rust -f ./heroku.dockerfile .
diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
@@ -15,7 +15,7 @@ jobs:
   build_and_push:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: git fetch --unshallow
     - name: Build & Push latest version
       run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [0.15.0] - 2022-12-10
+### Changed
+* Update dependencies
+* Update --help output by changing internal library
+* Increase MSRV to 1.60
+* Drop Heroku support removing heroku.yml
+* (Docker) Use Rust version 1.65.0 in build
+
 ## [0.14.1] - 2022-09-06
 ### Changed
 * Update dependencies
@@ -244,7 +252,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Added
 * Implement basic Piping Server
 
-[Unreleased]: https://github.com/nwtgck/piping-server-rust/compare/v0.14.1...HEAD
+[Unreleased]: https://github.com/nwtgck/piping-server-rust/compare/v0.15.0...HEAD
+[0.15.0]: https://github.com/nwtgck/piping-server-rust/compare/v0.14.1...v0.15.0
 [0.14.1]: https://github.com/nwtgck/piping-server-rust/compare/v0.14.0...v0.14.1
 [0.14.0]: https://github.com/nwtgck/piping-server-rust/compare/v0.13.0...v0.14.0
 [0.13.0]: https://github.com/nwtgck/piping-server-rust/compare/v0.12.1...v0.13.0