Skip to content

Commit

Permalink
Merge branch 'release/5.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Raksha-Bharuka committed Nov 21, 2024
2 parents b01bf8d + 64d362d commit 6080105
Show file tree
Hide file tree
Showing 14 changed files with 233 additions and 185 deletions.
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ updates:
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 8
33 changes: 33 additions & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Create JIRA Issue from Dependabot PR

on:
pull_request:
types: [ opened ]

jobs:
create_jira_issue:
if: github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Login
uses: atlassian/gajira-login@v3
env:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}

- name: Create JIRA Issue
uses: atlassian/gajira-create@v3
with:
project: "RCAT"
issuetype: "Task"
summary: "Dependabot PR: ${{ github.event.pull_request.title }}"
description: |
A new dependabot pull request has been created.
- **Branch**: ${{ github.event.pull_request.head.ref }}
- **PR Link**: ${{ github.event.pull_request.html_url }}
- **Author**: ${{ github.actor }}
94 changes: 54 additions & 40 deletions .github/workflows/orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@ jobs:
- orca-job: INTEGRATED_TEST_ON_LATEST_LTS
php-version: "8.1"

# # Testing Drupal 11 in php 8.3.
# - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
# php-version: "8.3"
#
# # Testing Drupal 11 in php 8.3.
# - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
# php-version: "8.3"
#
# # Testing Drupal 11 in php 8.3.
# - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
# php-version: "8.3"
#
# # Testing Drupal 11 in php 8.3.
# - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
# php-version: "8.3"
# # Testing Drupal 11 in php 8.3.
# - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
# php-version: "8.3"
#
# # Testing Drupal 11 in php 8.3.
# - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
# php-version: "8.3"
#
# # Testing Drupal 11 in php 8.3.
# - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
# php-version: "8.3"
#
# # Testing Drupal 11 in php 8.3.
# - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
# php-version: "8.3"

steps:
- uses: actions/checkout@v3
Expand All @@ -114,31 +114,45 @@ jobs:
with:
php-version: ${{ matrix.php-version }}
coverage: xdebug
# Commenting out to use the latest chrome and chromedriver versions.
# - name: Install google-chrome-stable
# run: |
# # Remove existing google chrome and install required version.
# sudo dpkg -r google-chrome-stable
# CHROME_VERSION_STRING="114.0.5735.198-1"
# wget --no-verbose -O /tmp/chrome.deb "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION_STRING}_amd64.deb" \
# && sudo apt install -y /tmp/chrome.deb \
# && sudo rm /tmp/chrome.deb
# sudo echo "CHROME_BIN=/usr/bin/google-chrome" | sudo tee -a /etc/environment
#
# # Download and unpack chromedriver.
# CHROME_DRIVER_VERSION_STRING="114.0.5735.90"
# CHROMEDRIVER_ARCHIVE="chromedriver_linux64.zip"
# CHROMEDRIVER_URL="https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION_STRING}/${CHROMEDRIVER_ARCHIVE}"
# CHROMEDRIVER_DIR="/usr/local/share/chromedriver-linux64"
# CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver"
# sudo rm -rf $CHROMEDRIVER_DIR
# sudo mkdir $CHROMEDRIVER_DIR
# echo "Installing chromedriver version"
# wget --no-verbose -O /tmp/$CHROMEDRIVER_ARCHIVE $CHROMEDRIVER_URL
# sudo unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d $CHROMEDRIVER_DIR
# sudo chmod +x $CHROMEDRIVER_BIN
# sudo ln -sf "$CHROMEDRIVER_BIN" /usr/bin/
# sudo echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | sudo tee -a /etc/environment

- name: Setup Chrome
uses: browser-actions/setup-chrome@v1.7.2
id: setup-chrome
with:
chrome-version: 119
install-chromedriver: true

- run: |
CHROME_BIN="${{ steps.setup-chrome.outputs.chrome-path }}"
sudo ln -sf "$CHROME_BIN" /usr/bin/
CHROMEDRIVER_BIN="${{ steps.setup-chrome.outputs.chromedriver-path }}"
sudo ln -sf "$CHROMEDRIVER_BIN" /usr/bin/
# Commenting out to use the latest chrome and chromedriver versions.
# - name: Install google-chrome-stable
# run: |
# # Remove existing google chrome and install required version.
# sudo dpkg -r google-chrome-stable
# CHROME_VERSION_STRING="114.0.5735.198-1"
# wget --no-verbose -O /tmp/chrome.deb "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION_STRING}_amd64.deb" \
# && sudo apt install -y /tmp/chrome.deb \
# && sudo rm /tmp/chrome.deb
# sudo echo "CHROME_BIN=/usr/bin/google-chrome" | sudo tee -a /etc/environment
#
# # Download and unpack chromedriver.
# CHROME_DRIVER_VERSION_STRING="114.0.5735.90"
# CHROMEDRIVER_ARCHIVE="chromedriver_linux64.zip"
# CHROMEDRIVER_URL="https://chromedriver.storage.googleapis.com/${CHROME_DRIVER_VERSION_STRING}/${CHROMEDRIVER_ARCHIVE}"
# CHROMEDRIVER_DIR="/usr/local/share/chromedriver-linux64"
# CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver"
# sudo rm -rf $CHROMEDRIVER_DIR
# sudo mkdir $CHROMEDRIVER_DIR
# echo "Installing chromedriver version"
# wget --no-verbose -O /tmp/$CHROMEDRIVER_ARCHIVE $CHROMEDRIVER_URL
# sudo unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d $CHROMEDRIVER_DIR
# sudo chmod +x $CHROMEDRIVER_BIN
# sudo ln -sf "$CHROMEDRIVER_BIN" /usr/bin/
# sudo echo "CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" | sudo tee -a /etc/environment

- name: Before install
run: |
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"ext-dom": "*",
"ext-json": "*",
"ext-sqlite3": "*",
"acquia/coding-standards": "^1.1.0",
"acquia/coding-standards": "^3.0.1",
"composer/composer": "^2.5.5",
"cweagans/composer-patches": "^1.7.3",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
Expand Down
75 changes: 38 additions & 37 deletions composer.lock

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

2 changes: 1 addition & 1 deletion config/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v4.14.0
v5.0.0
Loading

0 comments on commit 6080105

Please sign in to comment.