diff --git a/Jenkinsfile b/Jenkinsfile index 9238443..e6df508 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') SCARF_TOKEN=credentials('scarf_api_key') - EXT_GIT_BRANCH = 'master' + EXT_GIT_BRANCH = '2.x' EXT_USER = 'linuxserver' EXT_REPO = 'Heimdall' CONTAINER_NAME = 'heimdall' diff --git a/README.md b/README.md index 04c1316..4c6ff87 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ This image provides various versions that are available via tags. Please read th | Tag | Available | Description | | :----: | :----: |--- | | latest | ✅ | Stable Heimdall releases. | -| development | ✅ | Latest commit from the github master branch. | +| development | ✅ | Latest commit from the github 2.x branch. | ## Application Setup @@ -240,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.11.22:** - Build commits to upstream branch 2.x for the `development` tag. * **13.03.21:** - Make searchproviders.yaml user configurable. * **11.03.21:** - Rebase to alpine 3.14. * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 6bae949..cc91838 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,7 @@ release_type: stable release_tag: latest ls_branch: master repo_vars: - - EXT_GIT_BRANCH = 'master' + - EXT_GIT_BRANCH = '2.x' - EXT_USER = 'linuxserver' - EXT_REPO = 'Heimdall' - CONTAINER_NAME = 'heimdall' diff --git a/readme-vars.yml b/readme-vars.yml index c345964..0c1ea42 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -21,7 +21,7 @@ available_architectures: development_versions: true development_versions_items: - { tag: "latest", desc: "Stable Heimdall releases." } - - { tag: "development", desc: "Latest commit from the github master branch." } + - { tag: "development", desc: "Latest commit from the github 2.x branch." } # container parameters common_param_env_vars_enabled: true @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag." } - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." } - { date: "11.03.21:", desc: "Rebase to alpine 3.14." } - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." }