Skip to content

Commit

Permalink
Merge pull request #123 from AppQuality/develop
Browse files Browse the repository at this point in the history
release-2024-03-18
  • Loading branch information
sinatragianpaolo authored Mar 18, 2024
2 parents a7336f1 + 9b323b0 commit be3dc30
Show file tree
Hide file tree
Showing 367 changed files with 9,963 additions and 4,381 deletions.
95 changes: 95 additions & 0 deletions .git-branches.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# Git Town configuration file
#
# Run "git town config setup" to add additional entries
# to this file after updating Git Town.
#
# The "push-hook" setting determines whether Git Town
# permits or prevents Git hooks while pushing branches.
# Hooks are enabled by default. If your Git hooks are slow,
# you can disable them to speed up branch syncing.
#
# When disabled, Git Town pushes using the "--no-verify" switch.
# More info at https://www.git-town.com/preferences/push-hook.
push-hook = true

# Should Git Town push the new branches it creates
# immediately to origin even if they are empty?
#
# When enabled, you can run "git push" right away
# but creating new branches is slower and
# it triggers an unnecessary CI run on the empty branch.
#
# When disabled, many Git Town commands execute faster
# and Git Town will create the missing tracking branch
# on the first run of "git sync".
push-new-branches = true

# Should "git ship" delete the tracking branch?
# You want to disable this if your code hosting platform
# (GitHub, GitLab, etc) deletes head branches when
# merging pull requests through its UI.
ship-delete-tracking-branch = true

# Should "git ship" sync branches before shipping them?
#
# Guidance: enable when shipping branches locally on your machine
# and disable when shipping feature branches via the code hosting
# API or web UI.
#
# When enabled, branches are always fully up to date when shipped
# and you get a chance to resolve merge conflicts
# between the feature branch to ship and the main development branch
# on the feature branch. This helps keep the main branch green.
# But this also triggers another CI run and delays shipping.
sync-before-ship = true

# Should "git sync" also fetch updates from the upstream remote?
#
# If an "upstream" remote exists, and this setting is enabled,
# "git sync" will also update the local main branch
# with commits from the main branch at the upstream remote.
#
# This is useful if the repository you work on is a fork,
# and you want to keep it in sync with the repo it was forked from.
sync-upstream = false

[branches]

# The main branch is the branch from which you cut new feature branches,
# and into which you ship feature branches when they are done.
# This branch is often called "main", "master", or "development".
main = "develop"

# Perennial branches are long-lived branches.
# They are never shipped and have no ancestors.
# Typically, perennial branches have names like
# "development", "staging", "qa", "production", etc.
perennials = []

[hosting]

# Knowing the type of code hosting platform allows Git Town
# to open browser URLs and talk to the code hosting API.
# Most people can leave this on "auto-detect".
# Only change this if your code hosting server uses as custom URL.
platform = "github"

# When using SSH identities, define the hostname
# of your source code repository. Only change this
# if the auto-detection does not work for you.
# origin-hostname = ""

[sync-strategy]

# How should Git Town synchronize feature branches?
# Feature branches are short-lived branches cut from
# the main branch and shipped back into the main branch.
# Typically you develop features and bug fixes on them,
# hence their name.
feature-branches = "rebase"

# How should Git Town synchronize perennial branches?
# Perennial branches have no parent branch.
# The only updates they receive are additional commits
# made to their tracking branch somewhere else.
perennial-branches = "rebase"
61 changes: 51 additions & 10 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,61 @@
name: "Run tests"
name: Run E2E Tests
on:
pull_request:
workflow_dispatch:
pull_request:
types:
- opened
- synchronize
- reopened
- ready_for_review
push:
branches: [main, master, develop]

jobs:
install:
runs-on: ubuntu-latest
basicTests:
if: ${{ (github.event.pull_request.draft == false) || (github.event_name == 'push' ) || github.event_name == 'workflow_dispatch' }}
strategy:
fail-fast: false
matrix:
# run 3 copies of the job in parallel
shard: [1, 2, 3]

name: "Playwright Tests - pwc"
timeout-minutes: 20
runs-on: ubuntu-22.04
container: mcr.microsoft.com/playwright:v1.39.0-jammy

steps:
- uses: actions/checkout@v3
- name: "Install Node"
uses: actions/setup-node@v3
with:
node-version: 16
ref: ${{ github.event.pull_request.head.sha }}

# https://github.com/actions/runner-images/issues/6775
- run: |
echo "$GITHUB_WORKSPACE"
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Extract hash commit
shell: bash
run: |
COMMIT=$(git rev-parse --short HEAD)
echo "##[set-output name=commit;]$COMMIT"
id: extract_commit

- uses: actions/setup-node@v3
with:
node-version: "18.x"

- name: Install dependencies
run: |
echo //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} > .npmrc
yarn
- name: "Run Test"
run: yarn test:e2e
npm install -g yarn && yarn install --frozen-lockfile
npx playwright install chrome
- name: Run Tests
continue-on-error: false
env:
CURRENTS_PROJECT_ID: ${{ secrets.CURRENTS_PROJECT_ID }}
CURRENTS_RECORD_KEY: ${{ secrets.CURRENTS_RECORD_KEY }}

run: |
npx pwc --ci-build-id ${{ steps.extract_commit.outputs.commit }} --shard=${{ matrix.shard }}/${{ strategy.job-total }}
20 changes: 0 additions & 20 deletions cypress.config.ts

This file was deleted.

34 changes: 0 additions & 34 deletions cypress/e2e/Agreements/01-unauthorized.cy.ts

This file was deleted.

110 changes: 0 additions & 110 deletions cypress/e2e/Agreements/02-agreements-list.cy.ts

This file was deleted.

Loading

0 comments on commit be3dc30

Please sign in to comment.