Merge pull request 'master' (#26) from master into develop
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #26
This commit is contained in:
David 2024-05-20 21:53:51 +02:00
commit 277a896f16
5 changed files with 5 additions and 12 deletions

View File

@ -127,7 +127,6 @@ trigger:
# Variables
tag: &tag testing
repo: &repo phoenix.ipv64.de/kirbylink/warp4j
branch: &exclude_branch master
dry_run: &dry_run true
step_name: &step_name warp4j
pipeline_name: &pipeline_name warp4j build only (testing)
@ -184,8 +183,5 @@ steps:
status: [ success, failure ]
trigger:
branch:
exclude:
- *exclude_branch
event:
- pull_request

View File

@ -17,6 +17,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [origin warp4j] - 2019-02-28
- See origin repository: https://github.com/guziks/warp4j
[unreleased]: https://git.phoenix.ipv64.de/public/warp/compare/master...HEAD
[1.0.0]: https://git.phoenix.ipv64.de/GitHub_Mirrors/warp4j/compare/master...stable
[unreleased]: https://git.phoenix.ipv64.de/public/warp4j/compare/master...HEAD
[1.0.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/stable...master
[origin warp4j]: https://github.com/guziks/warp4j

View File

@ -5,5 +5,5 @@ RUN apt-get update && apt-get install -y \
unzip \
zip \
&& rm -rf /var/lib/apt/lists/*
RUN curl -s https://git.phoenix.ipv64.de/public/warp4j/raw/branch/develop/install.sh | /bin/sh -s
RUN curl -s https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/install.sh | /bin/sh -s
ENTRYPOINT [ "/usr/local/bin/warp4j" ]

View File

@ -113,10 +113,7 @@ Options:
Tested on the following operating systems:
- Debian 10.8
- Ubuntu 18.04
- macOS Mojave
- Windows Subsystem for Linux with Ubuntu 14.04
- Debian 12.5
## Cache Location

View File

@ -128,7 +128,7 @@ get_missing_deps() {
fi
}
WARP4J_LINK="https://git.phoenix.ipv64.de/public/warp4j/raw/branch/develop/warp4j"
WARP4J_LINK="https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/warp4j"
echo "Getting information about warp-packer releases..."
WARP_LINK=$(get_warp_link $THIS_PLATFORM $THIS_ARCHITECTURE)