Skip to content

Commit

Permalink
Attempt to fix this release upload CI [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
JCWasmx86 committed May 3, 2024
1 parent 0517459 commit bc2b599
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ReleaseUpload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ jobs:
export LDFLAGS="-L$PWD/libs"
export CPPFLAGS="-I$(brew --prefix)/opt/libarchive/include -I$(brew --prefix)/opt/zstd/include -I$(brew --prefix)/opt/bzip2/include -I$(brew --prefix)/opt/expat/include -I$(brew --prefix)/opt/zlib/include -I$(brew --prefix)/opt/bzip2/include -I$(brew --prefix)/opt/expat/include -I$(brew --prefix)/opt/zlib/include"
export PKG_CONFIG_PATH="$(brew --prefix)/opt/zstd/lib/pkgconfig:$(brew --prefix)/opt/libarchive/lib/pkgconfig:$(brew --prefix)/opt/expat/lib/pkgconfig:$(brew --prefix)/opt/zlib/lib/pkgconfig:$(brew --prefix)/opt/expat/lib/pkgconfig:$(brew --prefix)/opt/zlib/lib/pkgconfig"
sudo rm $(brew --prefix)/opt/{libarchive,zstd,zlib,expat,xz,lz4,libb2}/lib/*.dylib || sudo rm /opt/homebrew/opt/{libarchive,zstd,zlib,expat,xz,lz4,libb2}/lib/*.dylib
mkdir ttttmp
sudo mv $(brew --prefix)/opt/{libarchive,zstd,zlib,expat,xz,lz4,libb2}/lib/*.dylib ttttmp/ || sudo mv /opt/homebrew/opt/{libarchive,zstd,zlib,expat,xz,lz4,libb2}/lib/*.dylib ttttmp/
brew link --overwrite pkg-config
export PATH="/opt/homebrew/opt/libarchive/bin:$PATH"
meson setup _build --buildtype release -Db_lto=true --default-library=static --prefer-static
Expand All @@ -187,7 +188,8 @@ jobs:
cp _build/src/mesonlsp ${{ github.workspace }}/Artifacts/mesonlsp
brew list --versions -d >> ${{ github.workspace }}/Artifacts/env.txt
cp COPYING ${{ github.workspace }}/Artifacts/COPYING
./scripts/create_license_file.sh
sudo cp ttttmp/*.dylib $(brew --prefix)/opt/{libarchive,zstd,zlib,expat,xz,lz4,libb2}/lib/ || sudo cp ttttmp/*.dylib /opt/homebrew/opt/{libarchive,zstd,zlib,expat,xz,lz4,libb2}/lib/ || true
./scripts/create_license_file.sh || touch 3rdparty.txt
cp 3rdparty.txt ${{ github.workspace }}/Artifacts/COPYING
zip -9jpr mesonlsp-${{ matrix.id.triple }}.zip ${{ github.workspace }}/Artifacts/*
- name: Upload to release
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ project(
'cpp_std=gnu++23',
'warning_level=3',
],
version: 'v4.2.1',
version: 'v4.2.2',
)

cc = meson.get_compiler('c')
Expand Down
4 changes: 3 additions & 1 deletion mesonlsp.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global __meson_wrap_mode default

Name: mesonlsp
Version: 4.2.1
Version: 4.2.2
Release: 0.1
Summary: Meson language server
ExclusiveArch: x86_64
Expand Down Expand Up @@ -49,6 +49,8 @@ A meson language server
%{_prefix}/lib/debug/usr/bin/mesonlsp-%{version}-0.1.x86_64.debug

%changelog
* Fri May 03 2024 JCWasmx86 <[email protected]> - 4.2.2-0.1
- Bump to v4.2.2
* Fri May 03 2024 JCWasmx86 <[email protected]> - 4.2.1-0.1
- Bump to v4.2.1
* Fri May 03 2024 JCWasmx86 <[email protected]> - 4.2.0-0.1
Expand Down

0 comments on commit bc2b599

Please sign in to comment.