diff --git a/.travis.yml b/.travis.yml index 9b247b3..81d6911 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,6 @@ git: depth: 10 submodules: false -env: - global: - - BUILD_LEADER_ID=4 - cache: directories: - $HOME/Library/Caches/Homebrew @@ -45,14 +41,12 @@ jobs: services: - docker install: - - git config --replace-all remote.origin.fetch +refs/heads/*:refs/remotes/origin/* - - git fetch --tags - composer install --prefer-dist --no-interaction - nvm install 8 - nvm use 8 - npm install - script: skip - after_success: + script: + - docker build -t felixfbecker/php-language-server . - npm run semantic-release stages: diff --git a/dependencies.yml b/dependencies.yml index 320ae87..bf6bd77 100644 --- a/dependencies.yml +++ b/dependencies.yml @@ -1,10 +1,20 @@ collectors: +# pull requests for new major versions - type: php-composer path: / actors: - # pull requests for new major versions - type: php-composer versions: "Y.0.0" settings: commit_message_prefix: "chore: " +- type: js-npm + path: / + settings: + dist_tags: + semantic-release: next + actors: + - type: js-npm + versions: "Y.0.0" + settings: + commit_message_prefix: "chore: " diff --git a/package.json b/package.json index 75f02e1..6d6fe31 100644 --- a/package.json +++ b/package.json @@ -4,13 +4,16 @@ "private": true, "scripts": { "commitmsg": "validate-commit-msg", - "semantic-release": "semantic-release pre && php release-docker.php && semantic-release post" + "semantic-release": "semantic-release" }, "devDependencies": { + "@semantic-release/github": "^1.0.0", + "@semantic-release/last-release-git-tag": "^1.0.0", "cz-conventional-changelog": "^2.0.0", "husky": "^0.14.3", "last-release-git": "0.0.3", - "semantic-release": "^8.2.0", + "semantic-release": "^10.0.0", + "semantic-release-docker": "^1.0.0", "validate-commit-msg": "^2.14.0" }, "config": { @@ -19,7 +22,18 @@ } }, "release": { - "getLastRelease": "last-release-git" + "verifyConditions": [ + "@semantic-release/github", + "semantic-release-docker" + ], + "getLastRelease": "@semantic-release/last-release-git-tag", + "publish": [ + "@semantic-release/github", + { + "path": "semantic-release-docker", + "name": "felixfbecker/php-language-server" + } + ] }, "repository": { "type": "git", diff --git a/release-docker.php b/release-docker.php deleted file mode 100755 index f833d60..0000000 --- a/release-docker.php +++ /dev/null @@ -1,12 +0,0 @@ -version; - -system("docker login -e=$dockerEmail -u=$dockerUsername -p=$dockerPassword"); -system("docker build -t felixfbecker/php-language-server:latest ."); -system("docker tag felixfbecker/php-language-server:latest felixfbecker/php-language-server:$version ."); -system("docker push felixfbecker/php-language-server:$version"); -system("docker push felixfbecker/php-language-server:latest");