Philipp Hörist pushed to branch master at gajim / gajim
Commits:
9c566bd1 by Philipp Hörist at 2023-04-14T23:03:18+02:00
ci: Windows: Cleanup appveyor.yml
- - - - -
12fd384c by Philipp Hörist at 2023-04-14T23:23:02+02:00
ci: Adapt to release-helper changes
- - - - -
2 changed files:
- .ci/appveyor.yml
- .gitlab-ci.yml
Changes:
=====================================
.ci/appveyor.yml
=====================================
@@ -3,18 +3,8 @@ version: 1.1.{build}
image: Visual Studio 2019
environment:
- # matrix:
- MSYSTEM: MINGW64
- MSYS_ARCH: "x86_64"
- ARCH: "64bit"
-
- # - MSYSTEM: MINGW32
- # MSYS_ARCH: "i686"
- # ARCH: "32bit"
-
-branches:
- only:
- - master
+ MSYSTEM: MINGW64
+ ARCH: "64bit"
clone_depth: 1
@@ -30,7 +20,6 @@ install:
- bash -lc "pacman --needed --noconfirm -Su"
build_script:
-
- ps: |
$filename = "Gajim-$($env:GAJIM_VERSION)-$($env:ARCH)"
$filename_portable =
"Gajim-Portable-$($env:GAJIM_VERSION)-$($env:ARCH)"
@@ -48,8 +37,8 @@ build_script:
C:\msys64\usr\bin\sh.exe --login -c $command
}
- bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim"
- bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)"
+ git clone "$env:APPVEYOR_BUILD_FOLDER" "C:\msys64\home\appveyor\gajim"
+ bash "C:/msys64/home/appveyor/gajim/win/build.sh"
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
Push-AppveyorArtifact "$($buildroot)/Gajim.exe" -FileName
"$($filename).exe"
=====================================
.gitlab-ci.yml
=====================================
@@ -125,9 +125,9 @@ build-windows:
- >
release-helper build-windows-pkg \
--account=lovetox \
- --slug=gajim \
+ --repository=https://dev.gajim.org/gajim/gajim \
--branch=master \
- --tag=$CI_COMMIT_TAG \
+ --version=$CI_COMMIT_TAG \
--commit-sha=$CI_COMMIT_SHA \
--api-key=$APPVEYOR_API_KEY \
.ci/appveyor.yml
@@ -146,9 +146,9 @@ build-windows-nightly:
- >
release-helper build-windows-pkg \
--account=lovetox \
- --slug=gajim \
+ --repository=https://dev.gajim.org/gajim/gajim \
--branch=master \
- --tag=Nightly \
+ --version=Nightly \
--commit-sha=$CI_COMMIT_SHA \
--api-key=$APPVEYOR_API_KEY \
.ci/appveyor.yml
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/2a0cbe908e4b67d6630475ba1c684468d4c4b9f2...12fd384c645e585d0b057e53387a4a06364f2c8c
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/2a0cbe908e4b67d6630475ba1c684468d4c4b9f2...12fd384c645e585d0b057e53387a4a06364f2c8c
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
