From 828fdab7470c8d16d2edbe2cec919169524cb2bb Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Wed, 10 May 2023 19:06:40 +0530 Subject: Bump `actions/checkout` to v3 Fix Node 12 deprecation warnings in action runs. --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 652e65aa..5d4dc9ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Stable run: cargo test - name: Oldstable @@ -28,7 +28,7 @@ jobs: check-macos-arm: runs-on: macos-11 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install target run: rustup update && rustup target add aarch64-apple-darwin - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d16087b..1b911d96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-11 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install ARM target run: rustup update && rustup target add aarch64-apple-darwin - name: Test @@ -35,7 +35,7 @@ jobs: shell: bash steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Test run: cargo test --release - name: Build @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dependencies run: | sudo apt-get install cmake pkg-config libfreetype6-dev libfontconfig1-dev \ -- cgit From a6488a3e5edf1ac25c522e037c75b9d17e6bc3c6 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Tue, 16 May 2023 08:35:02 +0300 Subject: Fix upload from CI on windows --- .github/workflows/upload_asset.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to '.github') diff --git a/.github/workflows/upload_asset.sh b/.github/workflows/upload_asset.sh index 55845ae9..9e1f40e5 100755 --- a/.github/workflows/upload_asset.sh +++ b/.github/workflows/upload_asset.sh @@ -30,6 +30,7 @@ echo "Git tag: $tag" echo "Checking for existing release..." upload_url=$(\ curl \ + --http1.1 \ -H "Authorization: Bearer $bearer" \ "https://api.github.com/repos/$repo/releases" \ 2> /dev/null \ @@ -48,6 +49,7 @@ if [ -z "$upload_url" ]; then # Create new release. response=$( curl -f \ + --http1.1 \ -X POST \ -H "Authorization: Bearer $bearer" \ -d "{\"tag_name\":\"$tag\",\"draft\":true}" \ @@ -79,6 +81,7 @@ fi file_name=${file_path##*/} echo "Uploading asset $file_name to $upload_url..." curl -f \ + --http1.1 \ -X POST \ -H "Authorization: Bearer $bearer" \ -H "Content-Type: application/octet-stream" \ -- cgit From 6e7f466c68b387f41726757eed4f3e70d05479d2 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Tue, 16 May 2023 09:35:25 +0300 Subject: Update patch dependencies --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d4dc9ad..492e0f2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: run: cargo test - name: Oldstable run: | - rustup default 1.60.0 + rustup default 1.65.0 cargo test - name: Clippy run: | -- cgit From e3746e49a117ebf8d1f43715554c5a1cf8d4a116 Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Sun, 28 May 2023 12:13:09 +0200 Subject: Move manpages to scdoc This rewrites the existing manpages to use the `scdoc` format, making it simpler to read and edit the manpages without intricate roff knowledge. Some minor changes to the manpages were made in the process, mostly focusing on correcting some of the wording. The list of maintainers has also changed to ensure people not involved in the project anymore aren't unnecessarily contacted for support. --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.github') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b911d96..ed417a65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,13 +67,13 @@ jobs: - name: Install dependencies run: | sudo apt-get install cmake pkg-config libfreetype6-dev libfontconfig1-dev \ - libxcb-xfixes0-dev libxkbcommon-dev python3 + libxcb-xfixes0-dev libxkbcommon-dev python3 scdoc - name: Test run: cargo test --release - - name: Gzip manpage + - name: Generate manpages run: | - gzip -c "./extra/alacritty.man" > "./alacritty.1.gz" - gzip -c "./extra/alacritty-msg.man" > "./alacritty-msg.1.gz" + scdoc < extra/man/alacritty.1.scd | gzip -c > "./alacritty.1.gz" + scdoc < extra/man/alacritty-msg.1.scd | gzip -c > "./alacritty-msg.1.gz" - name: Upload Assets run: | mv ./extra/logo/alacritty-term.svg ./Alacritty.svg -- cgit From d94cb6be99b098b0084d0a54dc4e655cd9c0e47c Mon Sep 17 00:00:00 2001 From: maierd Date: Mon, 29 May 2023 11:22:15 +0200 Subject: Fix Makefile manpage generation Signed-off-by: Dennis Maier Co-authored-by: Christian Duerr --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.github') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed417a65..3eedddce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,8 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Install dependencies + run: brew install scdoc - name: Install ARM target run: rustup update && rustup target add aarch64-apple-darwin - name: Test -- cgit From bd4906722a1a026b01f06c94c33b13ff63a7e044 Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Mon, 12 Jun 2023 02:23:41 +0200 Subject: Switch to TOML configuration format This switches Alacritty's default configuration format from yaml to toml. While yaml is still supported, it is done by converting it to toml and should be removed entirely in the future. All existing features were persisted based on my testing. Behavior should not change much, though `--option` might have slightly different behavior since the entire line is not interpreted as one line of toml. A new `alacritty migrate` subcommand has been added which allows automatic migration from yaml to toml. This also could be used as a facility to automatically fix configuration file changes in the future. Closes #6592. --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3eedddce..98903798 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,6 +76,8 @@ jobs: run: | scdoc < extra/man/alacritty.1.scd | gzip -c > "./alacritty.1.gz" scdoc < extra/man/alacritty-msg.1.scd | gzip -c > "./alacritty-msg.1.gz" + scdoc < extra/man/alacritty.5.scd | gzip -c > "./alacritty.5.gz" + scdoc < extra/man/alacritty-bindings.5.scd | gzip -c > "./alacritty-bindings.5.gz" - name: Upload Assets run: | mv ./extra/logo/alacritty-term.svg ./Alacritty.svg @@ -87,4 +89,3 @@ jobs: ./.github/workflows/upload_asset.sh ./extra/completions/_alacritty $GITHUB_TOKEN ./.github/workflows/upload_asset.sh ./extra/linux/Alacritty.desktop $GITHUB_TOKEN ./.github/workflows/upload_asset.sh ./extra/alacritty.info $GITHUB_TOKEN - ./.github/workflows/upload_asset.sh ./alacritty.yml $GITHUB_TOKEN -- cgit From 43b7c1774c62e06e5a16561dc779d27ef9ad6a6f Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Mon, 26 Jun 2023 01:01:50 +0400 Subject: Update wix on the release CI Fixes #6939. --- .github/workflows/release.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98903798..ccf10322 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,14 +48,12 @@ jobs: ./.github/workflows/upload_asset.sh \ ./Alacritty-${GITHUB_REF##*/}-portable.exe $GITHUB_TOKEN - name: Install WiX - run: nuget install WiX + run: dotnet tool install --global wix --version 4.0.1 - name: Crate msi installer run: | - ./WiX.*/tools/candle.exe -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension \ - -out "./alacritty.wixobj" "alacritty/windows/wix/alacritty.wxs" - ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension \ - -out "./Alacritty-${GITHUB_REF##*/}-installer.msi" -sice:ICE61 -sice:ICE91 \ - "./alacritty.wixobj" + wix extension add WixToolset.UI.wixext WixToolset.Util.wixext + wix build -arch "x64" -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext \ + -out "./Alacritty-${GITHUB_REF##*/}-installer.msi" "alacritty/windows/wix/alacritty.wxs" - name: Upload msi installer run: | ./.github/workflows/upload_asset.sh \ -- cgit From 59c63d373804fe9d00d92d2dd47174d4e1637333 Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Sun, 8 Oct 2023 05:29:57 +0200 Subject: Update dependencies This patch applies all breaking and non-breaking dependency updates and bumps MSRV to 1.70.0. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 492e0f2e..c0a3b788 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: run: cargo test - name: Oldstable run: | - rustup default 1.65.0 + rustup default 1.70.0 cargo test - name: Clippy run: | -- cgit From 4b6ff13113575dffd6ebf0b861235c6a8eae2761 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Mon, 30 Oct 2023 01:54:42 +0400 Subject: Add man 5 pages to upload_asset.sh They are compiled, but not being uploaded. --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.github') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ccf10322..17b2d1af 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,6 +82,8 @@ jobs: ./.github/workflows/upload_asset.sh ./Alacritty.svg $GITHUB_TOKEN ./.github/workflows/upload_asset.sh ./alacritty.1.gz $GITHUB_TOKEN ./.github/workflows/upload_asset.sh ./alacritty-msg.1.gz $GITHUB_TOKEN + ./.github/workflows/upload_asset.sh ./alacritty.5.gz $GITHUB_TOKEN + ./.github/workflows/upload_asset.sh ./alacritty-bindings.5.gz $GITHUB_TOKEN ./.github/workflows/upload_asset.sh ./extra/completions/alacritty.bash $GITHUB_TOKEN ./.github/workflows/upload_asset.sh ./extra/completions/alacritty.fish $GITHUB_TOKEN ./.github/workflows/upload_asset.sh ./extra/completions/_alacritty $GITHUB_TOKEN -- cgit From b54d763154eff23692e06500a4aa342d847ef35a Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Sat, 6 Jan 2024 07:05:55 +0100 Subject: Fix serde tests without default features Authored-by: James McCoy --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.github') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0a3b788..0a0b5f6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,8 @@ jobs: - uses: actions/checkout@v3 - name: Stable run: cargo test + - name: Stable (no default features) + run: cargo test -p alacritty_terminal --no-default-features - name: Oldstable run: | rustup default 1.70.0 -- cgit