Merge pull request 'master' (#26 ) from master into develop

Reviewed-on: #26
Merge pull request 'Updating compatibility in README.md' (#25 ) from hotfix/updating_readme into master
2024-05-20 21:53:51 +02:00 · 2024-05-20 21:50:16 +02:00 · 2024-05-20 21:47:21 +02:00 · 2024-05-20 21:11:04 +02:00 · 2024-05-20 21:02:14 +02:00 · 2024-05-20 20:56:53 +02:00
5 changed files with 5 additions and 12 deletions
--- 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
--- 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
--- a/2
+++ b/2
@ -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" ]
--- 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

--- 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)
Author	SHA1	Message	Date
David	277a896f16	Merge pull request 'master' (#26 ) from master into develop All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #26	2024-05-20 21:53:51 +02:00
David	1c901cdf87	Merge pull request 'Updating compatibility in README.md' (#25 ) from hotfix/updating_readme into master All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details Reviewed-on: #25	2024-05-20 21:50:16 +02:00
david	75884d0b24	Updating compatibility in README.md All checks were successful continuous-integration/drone/pr Build is passing Details	2024-05-20 21:47:21 +02:00
David	85ff45f1b6	Merge pull request 'Fixing CHANGELOG.md link' (#24 ) from hotfix/Fixing_wrong_urls into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #24	2024-05-20 21:11:04 +02:00
david	f3382a5bac	Fixing CHANGELOG.md link All checks were successful continuous-integration/drone/pr Build is passing Details	2024-05-20 21:02:14 +02:00
David	1524ca306e	Merge pull request 'release/1.0.0' (#23 ) from release/1.0.0 into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #23	2024-05-20 20:56:53 +02:00
david	f3f4cdf29d	Adding PR check for master Some checks failed continuous-integration/drone/pr Build is failing Details	2024-05-20 20:51:32 +02:00
david	0db99a4a25	Preparing for release	2024-05-20 20:29:59 +02:00