Skip to content

Commit

Permalink
Merge branch 'main' into 550-consolidate-lintings-on-pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke authored Aug 21, 2023
2 parents 49f3571 + 459c892 commit 51c1d11
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/actions/download-tar-artifact/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ runs:
export slashes=$(grep -o "/" <<<"$path" | wc -l)
export amount=$((amount + slashes))
fi
echo "##[set-output name=amount;]$(echo ${amount})"
echo "amount=${amount}" >> $GITHUB_OUTPUT
shell: bash
id: manage-path-folder

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/extract-branch/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ runs:
).replace("refs/heads/","");
- name: 🪑 Set output
id: branch-name
run: echo "::set-output name=branch-name::$(echo $BRANCH_NAME)"
run: echo "branch-name=$BRANCH_NAME" >> $GITHUB_OUTPUT
shell: bash
env:
BRANCH_NAME: ${{steps.get-branch-name.outputs.result}}
8 changes: 4 additions & 4 deletions .github/workflows/01-get-publish-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:
OUTPUT=$(./.github/scripts/get-release.sh)
if [[ $OUTPUT == "RELEASE" ]];
then
echo "::set-output name=release::true"
echo "release=true" >> $GITHUB_OUTPUT
elif [[ $OUTPUT == "PRE_RELEASE" ]];
then
echo "::set-output name=preRelease::true"
echo "preRelease=true" >> $GITHUB_OUTPUT
fi
env:
GITHUB_REF: ${{ github.ref }}
Expand All @@ -50,7 +50,7 @@ jobs:

- name: ↔ Extract tag name
shell: bash
run: echo "##[set-output name=tag;]$(echo ${GITHUB_REF#refs/tags/})"
run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
id: extractTag

- name: 🏷 Get and Set Package Version on Env
Expand All @@ -62,7 +62,7 @@ jobs:
run: |
chmod +rx ./.github/scripts/package-version.sh
OUTPUT=$(./.github/scripts/package-version.sh)
echo "::set-output name=version::$OUTPUT"
echo "version=$OUTPUT" >> $GITHUB_OUTPUT
- name: 🌳 Log Valid Version
env:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/02-deploy-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ jobs:
run: |
if [[ $RELEASE == "true" || $PRE_RELEASE == "true" ]]
then
echo "##[set-output name=name;]$(echo ${GITHUB_REF#refs/tags/})"
echo "name=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
else
echo "##[set-output name=name;]$(echo $BRANCH_NAME)"
echo "name=$BRANCH_NAME" >> $GITHUB_OUTPUT
fi
id: extract

Expand Down
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"dialog-polyfill": "^0.5.6",
"dotenv": "^16.3.1",
"find-versions-cli": "^4.0.0",
"html-validate": "^8.2.0",
"html-validate": "^8.3.0",
"html5-boilerplate": "^8.0.0",
"husky": "^8.0.3",
"iframe-resizer": "^4.3.6",
Expand All @@ -94,7 +94,7 @@
"postcss-list-style-safari-fix": "^1.0.0",
"prettier": "^3.0.2",
"rimraf": "^5.0.1",
"sass": "^1.66.0",
"sass": "^1.66.1",
"start-server-and-test": "^2.0.0",
"stylelint": "^14.16.1",
"stylelint-config-prettier": "^9.0.5",
Expand Down

0 comments on commit 51c1d11

Please sign in to comment.