Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix release tarball compression #146

Merged
merged 2 commits into from
Apr 1, 2024
Merged

Fix release tarball compression #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
925a839
fix release tarball compression
Markos-Th09 Apr 1, 2024
5a04739
bump actions
Markos-Th09 Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache build
uses: Swatinem/rust-cache@v2
- name: Bench
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
CRATE_NAME: "clue"
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache build
uses: Swatinem/rust-cache@v2
- name: Build ${{ matrix.target }}
run: |
cargo build --target=${{ matrix.target }} --release -vv
cd target\${{ matrix.target }}\release && tar -cavf "$env:CRATE_NAME-${{ matrix.target }}.zip" "$env:CRATE_NAME.exe" && cd ../../..
- name: Upload clue-${{ matrix.target }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.CRATE_NAME }}-${{ matrix.target }}.zip
path: target\${{ matrix.target }}\release\${{ env.CRATE_NAME }}-${{ matrix.target }}.zip
Expand All @@ -42,7 +42,7 @@ jobs:
CRATE_NAME: "clue"
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache build
uses: Swatinem/rust-cache@v2
- name: Setup
Expand All @@ -53,9 +53,9 @@ jobs:
TARGET_CFLAGS: "--target=${{ matrix.target }}"
run: |
cargo build --release --target=${{ matrix.target }} -vv
cd target/${{ matrix.target }}/release/ && tar -cvf "$CRATE_NAME-${{ matrix.target }}.tar.gz" "$CRATE_NAME" && cd ../../..
( cd target/${{ matrix.target }}/release/ && tar -cavf "$CRATE_NAME-${{ matrix.target }}.tar.gz" "$CRATE_NAME" )
- name: Upload clue-${{ matrix.target }}.tar.gz
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.CRATE_NAME }}-${{ matrix.target }}.tar.gz
path: target/${{ matrix.target }}/release/${{ env.CRATE_NAME }}-${{ matrix.target }}.tar.gz
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
CRATE_NAME: "clue"
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache build
uses: Swatinem/rust-cache@v2
- name: Setup
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
- name: Build ${{ matrix.target }}
run: |
cargo build --target=${{ matrix.target }} --release -vv
cd target/${{ matrix.target }}/release/ && tar -cvf "$CRATE_NAME-${{ matrix.target }}.tar.gz" "$CRATE_NAME" && cd ../../..
( cd target/${{ matrix.target }}/release/ && tar -cavf "$CRATE_NAME-${{ matrix.target }}.tar.gz" "$CRATE_NAME" )
- name: Build deb
run: |
cd cli && cargo deb -p clue --target=${{ matrix.target }} && cd ..
Expand All @@ -129,17 +129,17 @@ jobs:
cargo-make-rpm -p clue --target=${{ matrix.target }}
echo "RPM_FILENAME=$(basename $(echo target/${{ matrix.target }}/rpm/*.rpm))" >> $GITHUB_ENV
- name: Upload ${{ env.CRATE_NAME }}-${{ matrix.target }}.tar.gz
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.CRATE_NAME }}-${{ matrix.target }}.tar.gz
path: target/${{ matrix.target }}/release/*.tar.gz
- name: Upload ${{ env.DEB_FILENAME }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.DEB_FILENAME }}
path: target/${{ matrix.target }}/debian/*.deb
- name: Upload ${{ env.RPM_FILENAME }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.RPM_FILENAME }}
path: target/${{ matrix.target }}/rpm/*.rpm
Expand All @@ -157,7 +157,7 @@ jobs:
CRATE_NAME: "clue"
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache build
uses: Swatinem/rust-cache@v2
- name: Setup
Expand All @@ -170,7 +170,7 @@ jobs:
wasm-pack build --target web --release
zip -r clue_wasm.zip pkg
- name: Upload clue_wasm.zip
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: clue_wasm.zip
path: wasm/clue_wasm.zip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache build
uses: Swatinem/rust-cache@v2
- name: Publish core
Expand All @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Publish AUR package
uses: KSXGitHub/github-actions-deploy-aur@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache build
uses: Swatinem/rust-cache@v2
- name: Setup
Expand All @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out repository code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache build
uses: Swatinem/rust-cache@v2
- name: Setup
Expand Down
4 changes: 1 addition & 3 deletions core/src/scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,9 +564,7 @@ const SYMBOLS: SymbolsMap = generate_map(&[
(
':',
SymbolType::Symbols(
generate_map(&[
(':', SymbolType::Just(DOUBLE_COLON)),
]),
generate_map(&[(':', SymbolType::Just(DOUBLE_COLON))]),
COLON,
),
),
Expand Down