Merge pull request #37 from coord-e/release/1.3.2

Release v1.3.2
coord-e · Nov 23, 2022 · 2df8f0f · 2df8f0f
2 parents 9fa27eb + e26abf7
commit 2df8f0f
Show file tree

Hide file tree

Showing 20 changed files with 188 additions and 144 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,75 +7,74 @@ name: Release
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         target:
           - x86_64-unknown-linux-musl
           - aarch64-unknown-linux-musl
+    env:
+      CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-gnu-gcc
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: sudo apt-get install -y musl-tools busybox-static
       - run: sudo apt-get install -y gcc-aarch64-linux-gnu
         if: matrix.target == 'aarch64-unknown-linux-musl'
       - run: rustup target add ${{ matrix.target }}
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             target/
             ~/.cargo/git/db/
             ~/.cargo/registry/cache/
             ~/.cargo/registry/index/
           key: "${{ runner.os }}-cargo-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}"
-      - uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release --all-features --target=${{ matrix.target }}
-      - uses: actions/upload-artifact@v2
+      - run: cargo build --release --all-features --target=${{ matrix.target }} --locked
+      - uses: actions/upload-artifact@v3
         with:
           name: musl-executable-${{ matrix.target }}
           path: ./target/${{ matrix.target }}/release/magicpak
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --release --all-features --target=${{ matrix.target }}
+      - run: cargo test --release --all-features --target=${{ matrix.target }}
         if: matrix.target == 'x86_64-unknown-linux-musl'  # TODO: test aarch64
   build_docker_images:
     name: Build and push docker images
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: test
     steps:
       - name: Free up disk space
         run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
         with:
           name: musl-executable-x86_64-unknown-linux-musl
       - run: mkdir -p dist/amd64 && mv ./magicpak ./dist/amd64/magicpak
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: musl-executable-aarch64-unknown-linux-musl
       - run: mkdir -p dist/arm64 && mv ./magicpak ./dist/arm64/magicpak
       - uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
-      - run: docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      - uses: docker/setup-buildx-action@v2
       - run: docker buildx bake --push --set '*.cache-from=type=gha' --set '*.cache-to=type=gha,mode=max'
         env:
           BIN_DIR: "./dist"
-          VERSION: "1.3.1"
+          VERSION: "1.3.2"
   release:
     name: Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: build_docker_images
     strategy:
       matrix:
         target:
           - x86_64-unknown-linux-musl
           - aarch64-unknown-linux-musl
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: musl-executable-${{ matrix.target }}
       - run: mv magicpak magicpak-${{ matrix.target }}
@@ -86,12 +85,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   upload:
     name: Upload to crates.io
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: release
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/cargo@v1
-        with:
-          command: publish
+      - uses: actions/checkout@v3
+      - run: cargo publish
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,70 +5,60 @@ name: Test and Lint
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         target:
           - x86_64-unknown-linux-musl
           - aarch64-unknown-linux-musl
+    env:
+      CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-gnu-gcc
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: sudo apt-get install -y musl-tools busybox-static
       - run: sudo apt-get install -y gcc-aarch64-linux-gnu
         if: matrix.target == 'aarch64-unknown-linux-musl'
       - run: rustup target add ${{ matrix.target }}
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             target/
             ~/.cargo/git/db/
             ~/.cargo/registry/cache/
             ~/.cargo/registry/index/
           key: "${{ runner.os }}-cargo-${{ matrix.target }}-${{ hashFiles('**/Cargo.lock') }}"
-      - uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --release --all-features --target=${{ matrix.target }}
-      - uses: actions/upload-artifact@v2
+      - run: cargo build --release --all-features --target=${{ matrix.target }} --locked
+      - uses: actions/upload-artifact@v3
         with:
           name: musl-executable-${{ matrix.target }}
           path: ./target/${{ matrix.target }}/release/magicpak
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --release --all-features --target=${{ matrix.target }}
+      - run: cargo test --release --all-features --target=${{ matrix.target }}
         if: matrix.target == 'x86_64-unknown-linux-musl'  # TODO: test aarch64
   fmt:
     name: Rustfmt
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+      - uses: actions/checkout@v3
+      - run: cargo fmt --all -- --check
   clippy:
     name: Clippy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features -- -D warnings
+      - uses: actions/checkout@v3
+      - run: cargo clippy --all-features -- -D warnings
   test_examples:
     name: Test examples
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: test
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
         with:
           name: musl-executable-x86_64-unknown-linux-musl
       - run: mkdir -p dist/amd64 && mv ./magicpak ./dist/amd64/magicpak
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v2
       - name: Build examples
         run: docker buildx bake --set '*.cache-from=type=gha' --set '*.cache-to=type=gha,mode=max' --set 'base.platform=linux/amd64' example
         env:
           BIN_DIR: ./dist
-          VERSION: 1.3.1
+          VERSION: 1.3.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.3.2] - 2022-11-23
+
+- Fix not to canonicalize paths in `--include` ([#20](https://github.com/coord-e/magicpak/pull/20))
+- Search statically linked dependencies of ELF objects specified by `--include` ([#33](https://github.com/coord-e/magicpak/pull/33))
+  - To deal with getaddrinfo(3) issue described in ([#12](https://github.com/coord-e/magicpak/issues/12))
+- Improve error messages ([#36](https://github.com/coord-e/magicpak/pull/36))
+- Dependency updates
+
 ## [1.3.1] - 2022-06-19
 
 - AArch64 support ([#14](https://github.com/coord-e/magicpak/pull/14))