Skip to content

Commit 1dd541f

Browse files
authored
Merge pull request #16 from codcod/8-improve-ci-for-speed-and-maintainability
fix: build issues
2 parents 367c690 + 738575e commit 1dd541f

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

.github/workflows/release.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
tag_prefix: "v"
7070
major_pattern: "(MAJOR|BREAKING CHANGE|!:)"
7171
minor_pattern: "(MINOR|feat:|feature:)"
72-
patch_pattern: "(PATCH|fix:|patch:|hotfix:)"
7372
version_format: "${major}.${minor}.${patch}"
7473
change_path: "src"
7574
namespace: ""
@@ -184,22 +183,23 @@ jobs:
184183
key: ${{ matrix.target }}
185184

186185
- name: Build for ${{ matrix.target }}
187-
run: |
188-
cargo build --release --target ${{ matrix.target }}
189-
if [[ "${{ matrix.target }}" == *"windows"* ]]; then
190-
mv target/${{ matrix.target }}/release/repos.exe repos-${{ matrix.target }}.exe
191-
else
192-
mv target/${{ matrix.target }}/release/repos repos-${{ matrix.target }}
193-
fi
194-
195-
- name: Strip binary (Unix only)
196-
if: matrix.suffix == ''
197-
run: |
198-
if [[ "${{ runner.os }}" == "macOS" ]]; then
199-
strip -x repos-${{ matrix.target }}
200-
else
201-
strip repos-${{ matrix.target }}
202-
fi
186+
run: cargo build --release --target ${{ matrix.target }}
187+
188+
- name: Rename Windows binary
189+
if: contains(matrix.target, 'windows')
190+
run: mv target/${{ matrix.target }}/release/repos.exe repos-${{ matrix.target }}.exe
191+
192+
- name: Rename Unix binary
193+
if: "!contains(matrix.target, 'windows')"
194+
run: mv target/${{ matrix.target }}/release/repos repos-${{ matrix.target }}
195+
196+
- name: Strip binary (macOS)
197+
if: "!contains(matrix.target, 'windows') && runner.os == 'macOS'"
198+
run: strip -x repos-${{ matrix.target }}
199+
200+
- name: Strip binary (Linux)
201+
if: "!contains(matrix.target, 'windows') && runner.os == 'Linux'"
202+
run: strip repos-${{ matrix.target }}
203203

204204
- name: Create archive
205205
shell: bash

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ RUN apk add --no-cache \
1313
gcc
1414

1515
# Copy dependency files first for better caching
16-
COPY Cargo.toml Cargo.lock ./
16+
COPY Cargo.toml ./
17+
COPY Cargo.loc[k] ./
1718

1819
# Create dummy source to build dependencies
1920
RUN mkdir src && echo "fn main() {}" > src/main.rs && \

0 commit comments

Comments
 (0)