diff --git a/.cargo/config.toml b/.cargo/config.toml index 915e521..2544dcc 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -17,3 +17,7 @@ linker = "aarch64-linux-gnu-gcc" [target.i686-unknown-linux-gnu] linker = "i686-linux-gnu-gcc" + +[env] +CC_i686-unknown-linux-gnu = "i686-linux-gnu-gcc" +CC_aarch64_unknown_linux_musl = "aarch64-linux-gnu-gcc" diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml index 1e5702d..64d3039 100644 --- a/.github/workflows/cross-ci.yml +++ b/.github/workflows/cross-ci.yml @@ -71,11 +71,11 @@ jobs: target: aarch64-unknown-linux-musl architecture: arm64 use-cross: true - # - os: ubuntu-latest - # os-name: linux - # target: i686-unknown-linux-gnu - # architecture: i686 - # use-cross: true + - os: ubuntu-latest + os-name: linux + target: i686-unknown-linux-gnu + architecture: i386 + use-cross: true # - os: ubuntu-latest # os-name: linux # target: armv7-unknown-linux-gnueabihf diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e062ec7..f3f25dc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -73,12 +73,12 @@ jobs: architecture: arm64 binary-postfix: "" use-cross: true - # - os: ubuntu-latest - # os-name: linux - # target: i686-unknown-linux-gnu - # architecture: i686 - # binary-postfix: "" - # use-cross: true + - os: ubuntu-latest + os-name: linux + target: i686-unknown-linux-gnu + architecture: i386 + binary-postfix: "" + use-cross: true # - os: ubuntu-latest # os-name: linux # target: armv7-unknown-linux-gnueabihf diff --git a/.github/workflows/prebuilt-pr.yml b/.github/workflows/prebuilt-pr.yml index bace97b..90f9a22 100644 --- a/.github/workflows/prebuilt-pr.yml +++ b/.github/workflows/prebuilt-pr.yml @@ -68,12 +68,12 @@ jobs: architecture: arm64 binary-postfix: "" use-cross: true - # - os: ubuntu-latest - # os-name: linux - # target: i686-unknown-linux-gnu - # architecture: i686 - # binary-postfix: "" - # use-cross: true + - os: ubuntu-latest + os-name: linux + target: i686-unknown-linux-gnu + architecture: i386 + binary-postfix: "" + use-cross: true # - os: ubuntu-latest # os-name: linux # target: armv7-unknown-linux-gnueabihf diff --git a/.github/workflows/release-cd.yml b/.github/workflows/release-cd.yml deleted file mode 100644 index 1f4fba4..0000000 --- a/.github/workflows/release-cd.yml +++ /dev/null @@ -1,118 +0,0 @@ -name: Build release binaries - -on: - push: - branches: - - "release/**" - -env: - BINARY_NAME: rustic-server - -jobs: - publish: - if: ${{ github.repository_owner == 'rustic-rs' }} - name: Publishing ${{ matrix.job.target }} - runs-on: ${{ matrix.job.os }} - strategy: - matrix: - rust: [stable] - job: - - os: windows-latest - os-name: windows - target: x86_64-pc-windows-msvc - architecture: x86_64 - binary-postfix: ".exe" - use-cross: false - - os: macos-13 - os-name: macos - target: x86_64-apple-darwin - architecture: x86_64 - binary-postfix: "" - use-cross: false - - os: macos-latest - os-name: macos - target: aarch64-apple-darwin - architecture: arm64 - binary-postfix: "" - use-cross: false - - os: ubuntu-latest - os-name: linux - target: x86_64-unknown-linux-gnu - architecture: x86_64 - binary-postfix: "" - use-cross: false - - os: ubuntu-latest - os-name: linux - target: x86_64-unknown-linux-musl - architecture: x86_64 - binary-postfix: "" - use-cross: false - - os: ubuntu-latest - os-name: linux - target: aarch64-unknown-linux-gnu - architecture: arm64 - binary-postfix: "" - use-cross: true - - os: ubuntu-latest - os-name: linux - target: aarch64-unknown-linux-musl - architecture: arm64 - binary-postfix: "" - use-cross: true - # - os: ubuntu-latest - # os-name: linux - # target: i686-unknown-linux-gnu - # architecture: i686 - # binary-postfix: "" - # use-cross: true - # - os: ubuntu-latest - # os-name: linux - # target: armv7-unknown-linux-gnueabihf - # architecture: armv7 - # binary-postfix: "" - # use-cross: true - - steps: - - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - with: - fetch-depth: 0 # fetch all history so that git describe works - - name: Create binary artifact - uses: rustic-rs/create-binary-artifact-action@main # dev - with: - toolchain: ${{ matrix.rust }} - target: ${{ matrix.job.target }} - use-cross: ${{ matrix.job.use-cross }} - describe-tag-suffix: "" - binary-postfix: ${{ matrix.job.binary-postfix }} - os: ${{ runner.os }} - binary-name: ${{ env.BINARY_NAME }} - package-secondary-name: ${{ matrix.job.target}} - github-token: ${{ secrets.GITHUB_TOKEN }} - gpg-release-private-key: ${{ secrets.GPG_RELEASE_PRIVATE_KEY }} - gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} - rsign-release-private-key: ${{ secrets.RSIGN_RELEASE_PRIVATE_KEY }} - rsign-passphrase: ${{ secrets.RSIGN_PASSPHRASE }} - github-ref: ${{ github.ref }} - sign-release: true - hash-release: true - use-project-version: false # not being used in rustic_server - # - # TODO!: add publishing to release draft - # TODO!: include changelog in release draft - # - # publish-cargo: - # name: Publishing to Cargo - # runs-on: ubuntu-latest - # steps: - # - name: Checkout repository - # uses: actions/checkout@v4 - # - name: Install Rust toolchain - # uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 # v1 - # with: - # toolchain: stable - # - uses: Swatinem/rust-cache@v2 - # with: - # key: ${{ matrix.job.target }} - # - name: Run Cargo Fmt - # run: cargo publish --token ${{ secrets.CARGO_API_KEY }} diff --git a/Cross.toml b/Cross.toml index 98eb66a..68a0447 100644 --- a/Cross.toml +++ b/Cross.toml @@ -6,9 +6,10 @@ pre-build = [ ] [target.i686-unknown-linux-gnu] +image = "ghcr.io/cross-rs/i686-unknown-linux-gnu:edge" pre-build = [ "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get --assume-yes install gcc-multilib-i686-linux-gnu:$CROSS_DEB_ARCH gcc-i686-linux-gnu:$CROSS_DEB_ARCH", + "apt-get update && apt-get --assume-yes install gcc-multilib-i686-linux-gnu gcc-i686-linux-gnu", ] [target.x86_64-pc-windows-gnu.env] diff --git a/dist-workspace.toml b/dist-workspace.toml index 6b06367..853d267 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -12,7 +12,7 @@ ci = "github" # The installers to generate for each app installers = ["shell", "powershell", "homebrew", "msi"] # Target platforms to build apps for (Rust target-triple syntax) -targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"] +targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", "i686-unknown-linux-gnu"] # Path that installers should place binaries in install-path = "CARGO_HOME" # Whether to install an updater program