diff --git a/.drone.yml b/.drone.yml index e8ff336..1b999a2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index ef3ee3e..1eda0e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index df5b357..ff4e8e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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" ] diff --git a/README.md b/README.md index 4c37dce..ca2e93d 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/install.sh b/install.sh index 69b6913..7595434 100755 --- a/install.sh +++ b/install.sh @@ -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)