Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup GitHub actions #3071

Merged
merged 5 commits into from
Mar 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 2 additions & 23 deletions .github/actions/after-e2e/action.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,9 @@
name: "After e2e"
description: "After e2e"

env:
storage_file: "./storage-state/AdminUserState.json"

inputs:
id:
description: 'test suite id'
required: true
type: number
aws-access-key-id:
description: 'aws access key id'
required: true
type: string
aws-secret-access-key:
description: 'aws secret access key'
required: true
type: string
aws-region:
description: 'aws region'
required: true
type: string
description: "Runs cleanup tasks after e2e run"

runs:
using: "composite"
steps:
- name: Remove storage file
shell: bash
run: rm -f ${{ env.storage_file }}
run: rm -f ./storage-state/AdminUserState.json
3 changes: 3 additions & 0 deletions .github/actions/before-e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ runs:
- name: Check content UP
shell: bash
run: ./node_modules/@alfresco/adf-cli/bin/adf-cli check-cs-env --host $APP_CONFIG_ECM_HOST -u $ADMIN_EMAIL -p $ADMIN_PASSWORD || exit 1

- name: Download artifacts
uses: ./.github/actions/download-job-artifact
with:
Expand All @@ -41,6 +42,7 @@ runs:
aws-access-key-id: ${{ inputs.aws-access-key-id }}
aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
aws-region: ${{ inputs.aws-region }}

- name: Replace variables in app.config.json
shell: bash
run: |
Expand All @@ -54,6 +56,7 @@ runs:
echo -e "\e[31m \_ ERROR: Variables are still present in the app.config.json file. Some of them might not have default value set.\e[0m";
exit 5;
fi

- name: Update webdriver-manager
shell: bash
run: |
Expand Down
24 changes: 9 additions & 15 deletions .github/actions/before-install/action.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
name: "Before install and variables setup"
description: "Before install and variables setup"

inputs:
artifact:
description: 'path to the artifact to archieve (tar.bz2) and upload (like ./dist)'
required: true
type: string
output:
description: 'the S3 object to copy it to, like: s3://bucket-name/folder/whatever.tar.bz2'
required: true
type: string

runs:
using: "composite"
steps:
- uses: ./.github/actions/setup

- name: setup S3 caching
shell: bash
run: |
S3_DBP_PATH="s3://alfresco-travis-builds/aca"

if [ "${{ github.event_name }}" == "push" ]; then
S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/$BRANCH_NAME"
S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/$BRANCH_NAME"
elif [ "${{ github.event_name }}" == "pull_request" ]; then
S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/$BRANCH_NAME"
echo "BASE_HASH=origin/$BRANCH_NAME" >> $GITHUB_ENV
S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/$BRANCH_NAME"
echo "BASE_HASH=origin/$BRANCH_NAME" >> $GITHUB_ENV
elif [ "${{ github.event_name }}" == "schedule" ]; then
S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/cron"
S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/cron"
else
S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/api"
S3_DBP_ROOT_FOLDER="$S3_DBP_PATH/api"
fi

echo "S3_DBP_FOLDER="$S3_DBP_ROOT_FOLDER/${{ github.run_id }}"" >> $GITHUB_ENV

- name: ADF linking
if: ${{ github.event_name == 'pull_request'}}
uses: ./.github/actions/adf-linking
5 changes: 3 additions & 2 deletions .github/actions/download-job-artifact/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ runs:
using: "composite"
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ inputs.aws-access-key-id }}
aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
aws-region: ${{ inputs.aws-region }}
- name: download build artifacts from s3

- name: Download build artifacts from s3
shell: bash
run: |
test ! -d ${{ inputs.output }} && mkdir -p ${{ inputs.output }}
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/get-image-tag/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ runs:
shell: bash
run: |
if [[ "${{ inputs.branch_name }}" == "master" ]]; then
TAG_VERSION="$(jq -cr '.version' < package.json)"
TAG_VERSION="$(jq -cr '.version' < package.json)"
else
TAG_VERSION="${{ inputs.branch_name }}-${{ github.run_id }},{{ inputs.branch_name }}"
TAG_VERSION="${{ inputs.branch_name }}-${{ github.run_id }},{{ inputs.branch_name }}"
fi
echo "TAG_VERSION=$TAG_VERSION" >> $GITHUB_ENV
4 changes: 2 additions & 2 deletions .github/actions/publish-libs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ runs:

- name: Publish to GH registry
shell: bash
run: ./scripts/gh/npm-publish.sh "$TAG" "$DRY_RUN"
run: ${{ github.action_path }}/npm-publish.sh "$TAG" "$DRY_RUN"
env:
NODE_AUTH_TOKEN: ${{ inputs.github_token }}
TAG: ${{ inputs.npm_tag }}
Expand All @@ -64,7 +64,7 @@ runs:

- name: Publish to NPM registry
shell: bash
run: ./scripts/gh/npm-publish.sh "$TAG" "$DRY_RUN"
run: ${{ github.action_path }}/npm-publish.sh "$TAG" "$DRY_RUN"
env:
NODE_AUTH_TOKEN: ${{ inputs.npm_registry_token }}
TAG: ${{ inputs.npm_tag }}
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions .github/actions/update-library-versions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ runs:
if [[ ${{ inputs.branch_name }} =~ ^master.*?$ ]] ; then
NEW_LIBRARY_VERSION="$VERSION_IN_PACKAGE_JSON"
else
NEW_LIBRARY_VERSION="${VERSION_IN_PACKAGE_JSON}.${PR_NUMBER}"
NEW_LIBRARY_VERSION="${VERSION_IN_PACKAGE_JSON}.${{ github.run_id }}"
fi

./scripts/gh/update-lib-versions.sh "$NEW_LIBRARY_VERSION" "${{ inputs.dry-run }}"
${{ github.action_path }}/update-lib-versions.sh "$NEW_LIBRARY_VERSION" "${{ inputs.dry-run }}"
5 changes: 3 additions & 2 deletions .github/actions/upload-job-artifact/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ runs:
using: "composite"
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ inputs.aws-access-key-id }}
aws-secret-access-key: ${{ inputs.aws-secret-access-key }}
aws-region: ${{ inputs.aws-region }}
- name: upload build artifacts to s3

- name: Upload build artifacts to s3
shell: bash
run: |
tar cvfj ./s3-artifact.tmp -C ${{ inputs.artifact }} `ls ${{ inputs.artifact }}`
Expand Down
37 changes: 18 additions & 19 deletions .github/workflows/aca-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,24 @@ jobs:
name: Trigger ACA Upstream
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Checkout Repository
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
cache: 'npm'
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
cache: 'npm'

- uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
with:
username: ${{ vars.BOT_GITHUB_USERNAME }}
email: ${{ vars.BOT_GITHUB_EMAIL }}
global: true
- name: Configure Git Author
uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]
with:
username: ${{ vars.BOT_GITHUB_USERNAME }}
email: ${{ vars.BOT_GITHUB_EMAIL }}
global: true

- name: Trigger Upstream
shell: bash
run: |
npm install github-api
./scripts/gh/update/update-project.sh -p $GH_BUILD_NUMBER -t $GH_TOKEN -v alpha -c $GH_COMMIT -r ${{ inputs.repo_to_update || 'alfresco-applications' }}
- name: Trigger Upstream
shell: bash
run: |
npm install github-api
./scripts/gh/update/update-project.sh -p $GH_BUILD_NUMBER -t $GH_TOKEN -v alpha -c $GH_COMMIT -r ${{ inputs.repo_to_update || 'alfresco-applications' }}
24 changes: 8 additions & 16 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,6 @@ jobs:
with:
options: "--suite=${{ matrix.e2e-suites.name }}"
- uses: ./.github/actions/after-e2e
with:
id: ${{ matrix.e2e-suites.id }}
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

e2es-playwright:
needs: [lint, build, unit-tests]
Expand Down Expand Up @@ -205,24 +200,13 @@ jobs:
options: "e2e/playwright/tests/folder-rules/playwright.config.ts"
test-runner: playwright
- uses: ./.github/actions/after-e2e
with:
id: 15
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

finalize:
if: ${{ always() }}
needs: [lint, build, unit-tests, e2es, e2es-playwright]
name: 'Finalize'
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 2
- uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]

- name: Check previous jobs status
if: >-
${{
Expand All @@ -231,6 +215,14 @@ jobs:
}}
run: exit 1

- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 2

- name: Extract commit message
uses: Alfresco/alfresco-build-tools/.github/actions/[email protected]

- name: Check ADF link
shell: bash
run: |
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/rebase.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
on:
name: Automatic Rebase

on:
issue_comment:
types: [created]
name: Automatic Rebase

jobs:
rebase:
name: Rebase
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
runs-on: ubuntu-latest
steps:
- name: Checkout the latest code
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Automatic Rebase
uses: cirrus-actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout the latest code
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Automatic Rebase
uses: cirrus-actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
12 changes: 3 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,15 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 2

- name: Setup node
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
cache: 'npm'

- uses: ./.github/actions/setup
- name: check PR number
id: action
uses: kamatama41/get-pr-number-action@v0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
- name: save PR number
shell: bash
run: |
echo "PR_NUMBER=${{ steps.action.outputs.number }}" >> $GITHUB_ENV

- name: publish
uses: ./.github/actions/publish-libs
with:
Expand Down
20 changes: 0 additions & 20 deletions scripts/run

This file was deleted.

32 changes: 0 additions & 32 deletions scripts/tsconfig.json

This file was deleted.