From d4ef7c14120733d58a22888ccebaa6fad706cc96 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 3 Jun 2020 12:14:55 -0400 Subject: [PATCH] Remove colons from image filenames --- .github/workflows/ci.yaml | 16 ++++++++-------- .github/workflows/publish.yaml | 4 ++-- ci/dev/lint.sh | 2 +- ci/images/{centos:7 => centos7}/Dockerfile | 0 ci/images/{debian:8 => debian8}/Dockerfile | 0 doc/CONTRIBUTING.md | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename ci/images/{centos:7 => centos7}/Dockerfile (100%) rename ci/images/{debian:8 => debian8}/Dockerfile (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 03bd00b0..1cb58963 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Run ./ci/steps/fmt.sh - uses: ./ci/images/debian:8 + uses: ./ci/images/debian8 with: args: ./ci/steps/fmt.sh @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Run ./ci/steps/lint.sh - uses: ./ci/images/debian:8 + uses: ./ci/images/debian8 with: args: ./ci/steps/lint.sh @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Run ./ci/steps/test.sh - uses: ./ci/images/debian:8 + uses: ./ci/images/debian8 with: args: ./ci/steps/test.sh @@ -35,7 +35,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Run ./ci/steps/release.sh - uses: ./ci/images/debian:8 + uses: ./ci/images/debian8 with: args: ./ci/steps/release.sh - name: Upload npm package artifact @@ -55,7 +55,7 @@ jobs: name: npm-package path: ./release-npm-package - name: Run ./ci/steps/release-packages.sh - uses: ./ci/images/centos:7 + uses: ./ci/images/centos7 with: args: ./ci/steps/release-packages.sh - name: Upload release artifacts @@ -75,7 +75,7 @@ jobs: name: npm-package path: ./release-npm-package - name: Run ./ci/steps/release-packages.sh - uses: ./ci/images/centos:7 + uses: ./ci/images/centos7 with: args: ./ci/steps/release-packages.sh - name: Upload release artifacts @@ -116,7 +116,7 @@ jobs: name: release-packages path: ./release-packages - name: Run ./ci/steps/build-docker-image.sh - uses: ./ci/images/debian:8 + uses: ./ci/images/debian8 with: args: ./ci/steps/build-docker-image.sh - name: Upload release image @@ -136,7 +136,7 @@ jobs: name: release-packages path: ./release-packages - name: Run ./ci/steps/build-docker-image.sh - uses: ./ci/images/debian:8 + uses: ./ci/images/debian8 with: args: ./ci/steps/build-docker-image.sh - name: Upload release image diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 0eede125..c2fe429b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Run ./ci/steps/publish-npm.sh - uses: ./ci/images/debian:8 + uses: ./ci/images/debian8 with: args: ./ci/steps/publish-npm.sh env: @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Run ./ci/steps/push-docker-manifest.sh - uses: ./ci/images/debian:8 + uses: ./ci/images/debian8 with: args: ./ci/steps/push-docker-manifest.sh env: diff --git a/ci/dev/lint.sh b/ci/dev/lint.sh index 72de463e..1d793717 100755 --- a/ci/dev/lint.sh +++ b/ci/dev/lint.sh @@ -7,7 +7,7 @@ main() { eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js") stylelint $(git ls-files "*.css") tsc --noEmit - # See comment in ./ci/image/debian:8 + # See comment in ./ci/image/debian8 if [[ ! ${CI-} ]]; then shellcheck -e SC2046,SC2164,SC2154,SC1091,SC1090 $(git ls-files "*.sh") fi diff --git a/ci/images/centos:7/Dockerfile b/ci/images/centos7/Dockerfile similarity index 100% rename from ci/images/centos:7/Dockerfile rename to ci/images/centos7/Dockerfile diff --git a/ci/images/debian:8/Dockerfile b/ci/images/debian8/Dockerfile similarity index 100% rename from ci/images/debian:8/Dockerfile rename to ci/images/debian8/Dockerfile diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 706a5648..219e4846 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -21,7 +21,7 @@ Differences: - We require a minimum of node v12 but later versions should work. - We use [fnpm](https://github.com/goreleaser/nfpm) to build `.deb` and `.rpm` packages. - We use [jq](https://stedolan.github.io/jq/) to build code-server releases. -- The [CI container](../ci/images/debian:8/Dockerfile) is a useful reference for all our dependencies. +- The [CI container](../ci/images/debian8/Dockerfile) is a useful reference for all our dependencies. ## Development Workflow -- GitLab