mirror of
https://github.com/super-linter/super-linter.git
synced 2024-11-25 15:41:02 -05:00
fixed?
This commit is contained in:
parent
f51f677ac5
commit
8d1f1c8427
2 changed files with 2 additions and 22 deletions
|
@ -20,7 +20,7 @@ GITHUB_WORKSPACE="${GITHUB_WORKSPACE}" # Github Workspace
|
||||||
DOCKER_USERNAME="${DOCKER_USERNAME}" # Username to login to DockerHub
|
DOCKER_USERNAME="${DOCKER_USERNAME}" # Username to login to DockerHub
|
||||||
DOCKER_PASSWORD="${DOCKER_PASSWORD}" # Password to login to DockerHub
|
DOCKER_PASSWORD="${DOCKER_PASSWORD}" # Password to login to DockerHub
|
||||||
IMAGE_REPO="${IMAGE_REPO}" # Image repo to upload the image
|
IMAGE_REPO="${IMAGE_REPO}" # Image repo to upload the image
|
||||||
IMAGE_VERSION="${GITHUB_SHA}" # Version to tag the image
|
IMAGE_VERSION="${IMAGE_VERSION}" # Version to tag the image
|
||||||
DOCKERFILE_PATH="${DOCKERFILE_PATH}" # Path to the Dockerfile to be uploaded
|
DOCKERFILE_PATH="${DOCKERFILE_PATH}" # Path to the Dockerfile to be uploaded
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -109,25 +109,6 @@ ValidateInput()
|
||||||
# Check if we need to get the name of the branch #
|
# Check if we need to get the name of the branch #
|
||||||
##################################################
|
##################################################
|
||||||
if [[ "$IMAGE_VERSION" != "latest" ]]; then
|
if [[ "$IMAGE_VERSION" != "latest" ]]; then
|
||||||
##############################
|
|
||||||
# Get the name of the branch #
|
|
||||||
##############################
|
|
||||||
BRANCH_NAME=$(git branch --contains "$GITHUB_SHA" |awk '{print $2}' 2>&1)
|
|
||||||
|
|
||||||
#######################
|
|
||||||
# Load the error code #
|
|
||||||
#######################
|
|
||||||
ERROR_CODE=$?
|
|
||||||
|
|
||||||
##############################
|
|
||||||
# Check the shell for errors #
|
|
||||||
##############################
|
|
||||||
if [ $ERROR_CODE -ne 0 ]; then
|
|
||||||
echo "ERROR! Failed to get branch name!"
|
|
||||||
echo "ERROR:[$BRANCH_NAME]"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
###################################
|
###################################
|
||||||
# Remove non alpha-numberic chars #
|
# Remove non alpha-numberic chars #
|
||||||
###################################
|
###################################
|
||||||
|
|
3
.github/workflows/cleanup-DEV.yml
vendored
3
.github/workflows/cleanup-DEV.yml
vendored
|
@ -36,8 +36,6 @@ jobs:
|
||||||
##########################
|
##########################
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
with:
|
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
|
||||||
|
|
||||||
######################
|
######################
|
||||||
# Run Removal script #
|
# Run Removal script #
|
||||||
|
@ -48,5 +46,6 @@ jobs:
|
||||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
IMAGE_REPO: admiralawkbar/super-linter
|
IMAGE_REPO: admiralawkbar/super-linter
|
||||||
|
IMAGE_VERSION: ${{ github.event.pull_request.head.ref }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: .automation/cleanup-docker.sh
|
run: .automation/cleanup-docker.sh
|
||||||
|
|
Loading…
Reference in a new issue