mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-10-01 14:41:14 +00:00
[ACS-10124] Fix Change this action to not use user-controlled data directly in a run block sonar issue (#4810)
* [ACS-10124] Fix Change this action to not use user-controlled data directly in a run block sonar issue * [ACS-10124] Corrected typo
This commit is contained in:
7
.github/actions/get-image-tag/action.yml
vendored
7
.github/actions/get-image-tag/action.yml
vendored
@@ -11,10 +11,13 @@ runs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Get docker image tag name
|
- name: Get docker image tag name
|
||||||
shell: bash
|
shell: bash
|
||||||
|
env:
|
||||||
|
BRANCH_NAME: ${{ inputs.branch_name }}
|
||||||
|
RUN_ID: ${{ github.run_id }}
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ inputs.branch_name }}" == "master" ]] || [[ "${{ inputs.branch_name }}" == release/* ]]; then
|
if [[ "$BRANCH_NAME" == "master" ]] || [[ "$BRANCH_NAME" == release/* ]]; then
|
||||||
TAG_VERSION="$(jq -cr '.version' < package.json)"
|
TAG_VERSION="$(jq -cr '.version' < package.json)"
|
||||||
else
|
else
|
||||||
TAG_VERSION="${{ inputs.branch_name }}-${{ github.run_id }}"
|
TAG_VERSION="${BRANCH_NAME}-${RUN_ID}"
|
||||||
fi
|
fi
|
||||||
echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV
|
echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV
|
||||||
|
7
.github/actions/git-tag/action.yml
vendored
7
.github/actions/git-tag/action.yml
vendored
@@ -17,8 +17,11 @@ runs:
|
|||||||
steps:
|
steps:
|
||||||
- name: publish tag
|
- name: publish tag
|
||||||
shell: bash
|
shell: bash
|
||||||
|
env:
|
||||||
|
BRANCH_NAME: ${{ inputs.branch_name }}
|
||||||
|
GITHUB_TOKEN: ${{ inputs.github_token }}
|
||||||
run: |
|
run: |
|
||||||
if [[ "${{ inputs.branch_name }}" == "master" ]] || [[ "${{ inputs.branch_name }}" == release/* ]]; then
|
if [[ "$BRANCH_NAME" == "master" ]] || [[ "$BRANCH_NAME" == release/* ]]; then
|
||||||
VERSION=$(jq -cr '.version' < package.json)
|
VERSION=$(jq -cr '.version' < package.json)
|
||||||
echo "git tag -a ${VERSION} -m ${VERSION}"
|
echo "git tag -a ${VERSION} -m ${VERSION}"
|
||||||
|
|
||||||
@@ -28,7 +31,7 @@ runs:
|
|||||||
if [[ "${{ inputs.dry-run }}" != "true" ]]; then
|
if [[ "${{ inputs.dry-run }}" != "true" ]]; then
|
||||||
git tag -a ${VERSION} -m "${VERSION} [ci skip] "
|
git tag -a ${VERSION} -m "${VERSION} [ci skip] "
|
||||||
git remote rm origin
|
git remote rm origin
|
||||||
GITHUB_REPO=https://${{ inputs.github_token }}:x-oauth-basic@github.com/Alfresco/alfresco-content-app.git
|
GITHUB_REPO=https://$GITHUB_TOKEN:x-oauth-basic@github.com/Alfresco/alfresco-content-app.git
|
||||||
git remote add origin $GITHUB_REPO
|
git remote add origin $GITHUB_REPO
|
||||||
git push origin --tags
|
git push origin --tags
|
||||||
fi
|
fi
|
||||||
|
@@ -19,6 +19,8 @@ runs:
|
|||||||
|
|
||||||
- name: Setup and run with options
|
- name: Setup and run with options
|
||||||
shell: bash
|
shell: bash
|
||||||
|
env:
|
||||||
|
OPTIONS: ${{ inputs.options }}
|
||||||
run: |
|
run: |
|
||||||
npm start > /dev/null &\
|
npm start > /dev/null &\
|
||||||
|
|
||||||
@@ -29,5 +31,5 @@ runs:
|
|||||||
done
|
done
|
||||||
printf "\nApplication is ready.\n"
|
printf "\nApplication is ready.\n"
|
||||||
|
|
||||||
echo "Running playwright tests with options ${{ inputs.options }}"
|
echo "Running playwright tests with options $OPTIONS"
|
||||||
E2E_TARGET=${{ inputs.options }} npm run ci:e2e
|
E2E_TARGET=$OPTIONS npm run ci:e2e
|
||||||
|
6
.github/actions/setup/action.yml
vendored
6
.github/actions/setup/action.yml
vendored
@@ -22,9 +22,11 @@ runs:
|
|||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.33.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.33.0
|
||||||
- name: set TAG_NPM
|
- name: set TAG_NPM
|
||||||
shell: bash
|
shell: bash
|
||||||
|
env:
|
||||||
|
NPM_TAG: ${{ inputs.npm_tag }}
|
||||||
run: |
|
run: |
|
||||||
if [[ -n "${{ inputs.npm_tag }}" ]]; then
|
if [[ -n "$NPM_TAG" ]]; then
|
||||||
TAG_NPM=${{ inputs.npm_tag }}
|
TAG_NPM=$NPM_TAG
|
||||||
else
|
else
|
||||||
TAG_NPM="alpha"
|
TAG_NPM="alpha"
|
||||||
VERSION_IN_PACKAGE_JSON=$(jq -cr '.version' < package.json)
|
VERSION_IN_PACKAGE_JSON=$(jq -cr '.version' < package.json)
|
||||||
|
@@ -14,10 +14,12 @@ runs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Update Versions
|
- name: Update Versions
|
||||||
shell: bash
|
shell: bash
|
||||||
|
env:
|
||||||
|
BRANCH_NAME: ${{ inputs.branch_name }}
|
||||||
run: |
|
run: |
|
||||||
VERSION_IN_PACKAGE_JSON=$(jq -cr '.version' < package.json)
|
VERSION_IN_PACKAGE_JSON=$(jq -cr '.version' < package.json)
|
||||||
|
|
||||||
if [[ ${{ inputs.branch_name }} =~ ^master.*?$ ]] || [[ "${{ inputs.branch_name }}" == release/* ]] ; then
|
if [[ $BRANCH_NAME =~ ^master.*?$ ]] || [[ "$BRANCH_NAME" == release/* ]] ; then
|
||||||
NEW_LIBRARY_VERSION="$VERSION_IN_PACKAGE_JSON"
|
NEW_LIBRARY_VERSION="$VERSION_IN_PACKAGE_JSON"
|
||||||
else
|
else
|
||||||
NEW_LIBRARY_VERSION="${VERSION_IN_PACKAGE_JSON}-${{ github.run_id }}"
|
NEW_LIBRARY_VERSION="${VERSION_IN_PACKAGE_JSON}-${{ github.run_id }}"
|
||||||
|
Reference in New Issue
Block a user