diff --git a/.github/in-solidarity.yml b/.github/in-solidarity.yml deleted file mode 100644 index fdbd72ad..00000000 --- a/.github/in-solidarity.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ignore: - - "tools/hybrid-quickstart/steps.sh" # because the GKE cli uses 'master' - - "tools/target-server-validator/callout/build_java_callout.sh" # because github.com/apigee/api-platform-samples uses voliating branch name diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 49cbbd49..01f63952 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,7 +38,6 @@ checks - All projects are listed in [CODEOWNERS](./CODEOWNERS) and [README](./README.md) - Contributor License [Agreement](https://opensource.google/docs/cla/) -- In [Solidarity](https://developers.google.com/style/inclusive-documentation) - [Pipelines](./PIPELINES.md) - Commit messages follow [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standards to tell the release automation which [SemVer](https://semver.org/) diff --git a/PIPELINES.md b/PIPELINES.md index 080966bb..48d0da3f 100644 --- a/PIPELINES.md +++ b/PIPELINES.md @@ -65,11 +65,11 @@ The pipeline context also has the `gcloud` context of a serviceaccount user ## Static Checks Static code checks such as [Mega Linter](https://megalinter.github.io/) - and [In Solidarity](https://github.com/apps/in-solidarity) are part of the - linter workflow. They do not need to be included in your pipeline script. We - recommend you allow the DevRel [workflows](.github/workflows) to automatically - run on your fork as this is simpler than running locally. In case the workflows - are disabled, you can manually enable them again as described [here](https://docs.github.com/en/actions/managing-workflow-runs/disabling-and-enabling-a-workflow). + are part of the linter workflow. They do not need to be included in your + pipeline script. We recommend you allow the DevRel [workflows](.github/workflows) + to automatically run on your fork as this is simpler than running locally. In case + the workflows are disabled, you can manually enable them again as described + [here](https://docs.github.com/en/actions/managing-workflow-runs/disabling-and-enabling-a-workflow). We don't mind if the Pull Request fails at first due to these checks! ## GitHub Pages diff --git a/README.md b/README.md index 7d32f06a..84442d92 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,6 @@ limitations under the License. --> -[![In Solidarity](https://github.com/jpoehnelt/in-solidarity-bot/raw/main/static//badge-flat.png)](https://github.com/apps/in-solidarity) - Common solutions and tools developed by Apigee. ## References