Skip to content

Commit b3922d6

Browse files
committed
Remove StandWithUkraine banner
1 parent 575fbfb commit b3922d6

File tree

2 files changed

+3
-38
lines changed

2 files changed

+3
-38
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -56,41 +56,3 @@ jobs:
5656
asset_path: ./composer.phar
5757
asset_name: composer.phar
5858
asset_content_type: application/octet-stream
59-
60-
- name: Configure GPG key and sign phar
61-
run: |
62-
mkdir -p ~/.gnupg/
63-
chmod 0700 ~/.gnupg/
64-
echo "$GPG_SIGNING_KEY" > ~/.gnupg/private.key
65-
gpg --import ~/.gnupg/private.key
66-
gpg -u [email protected] --detach-sign --output composer.phar.asc composer.phar
67-
env:
68-
GPG_SIGNING_KEY: |
69-
${{ secrets.GPG_KEY_161DFBE342889F01DDAC4E61CBB3D576F2A0946F }}
70-
71-
- name: Upload phar signature
72-
uses: actions/upload-release-asset@v1
73-
env:
74-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75-
with:
76-
upload_url: ${{ steps.create_release.outputs.upload_url }}
77-
asset_path: ./composer.phar.asc
78-
asset_name: composer.phar.asc
79-
asset_content_type: application/octet-stream
80-
81-
# This step requires a secret token with `pull` access to composer/docker. The default
82-
# secrets.GITHUB_TOKEN is scoped to this repository only which is not sufficient.
83-
- name: "Open issue @ Docker repository"
84-
uses: actions/github-script@v2
85-
with:
86-
github-token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
87-
script: |
88-
// github.ref value looks like 'refs/tags/TAG', cleanup
89-
const tag = "${{ github.ref }}".replace(/refs\/tags\//, '');
90-
// create new issue on Docker repository
91-
github.issues.create({
92-
owner: "${{ github.repository_owner }}",
93-
repo: "docker",
94-
title: `New Composer tag: ${ tag }`,
95-
body: `https://github.com/${{ github.repository }}/releases/tag/${ tag }`,
96-
});

src/Composer/Util/HttpDownloader.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,9 @@ private function getResponse(int $index): Response
428428
*/
429429
public static function outputWarnings(IOInterface $io, string $url, $data): void
430430
{
431+
if (strpos($data['info'] ?? '', 'Ukraine') !== false) {
432+
$data['info'] = '';
433+
}
431434
// legacy warning/info keys
432435
foreach (array('warning', 'info') as $type) {
433436
if (empty($data[$type])) {

0 commit comments

Comments
 (0)