Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into CLI-1121
Browse files Browse the repository at this point in the history
  • Loading branch information
danepowell committed Oct 31, 2023
2 parents b89f89c + bf2b514 commit d145d7b
Show file tree
Hide file tree
Showing 41 changed files with 3,591 additions and 3,332 deletions.
1 change: 1 addition & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ template: |
## What's new since $PREVIOUS_TAG
$CHANGES
prerelease: true
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-22.04"]
php: ["8.0", "8.1", "8.2"]
php: ["8.1", "8.2"]
coverage: ["none"]
include:
- os: "ubuntu-22.04"
Expand Down Expand Up @@ -84,6 +84,7 @@ jobs:
- uses: shivammathur/setup-php@v2
with:
coverage: none
php-version: '8.1'
- name: 'Get ACLI version'
id: acli-version
run: |
Expand All @@ -109,12 +110,12 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: acli.phar
path: build/acli.phar
path: var/acli.phar
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: build/acli.phar
files: var/acli.phar
# Require all checks to pass without having to enumerate them in the branch protection UI.
# @see https://github.community/t/is-it-possible-to-require-all-github-actions-tasks-to-pass-without-enumerating-them/117957
check:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ jobs:
secrets:
jira-api-token: ${{ secrets.JIRA_API_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
jira-user-email: ${{ secrets.JIRA_USER_EMAIL }}
2 changes: 1 addition & 1 deletion .github/workflows/mutation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
tools: composer:v2
coverage: pcov

Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Jira release creator
on:
release:
types: [prereleased]
types: [published]

jobs:
create-ticket:
Expand All @@ -27,13 +27,14 @@ jobs:
echo "EOF" >> $GITHUB_ENV
shell: bash
- name: Login to Jira
uses: acquia/gajira-login@bearer
uses: atlassian/gajira-login@v3
env:
JIRA_BASE_URL: ${{ vars.JIRA_BASE_URL }}
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
- name: Create CCB ticket in Jira
id: create
uses: acquia/gajira-create@bearer
uses: atlassian/gajira-create@v3
with:
project: CLI
issuetype: Release
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

drupal
.idea
build
*.bak
.DS_STORE

Expand Down
3 changes: 1 addition & 2 deletions .phplint.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
path: ./
jobs: 10
cache: build/phplint.cache
cache: var/phplint.cache
extensions:
- php
exclude:
- build
- var
- vendor
warning: false
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Any changes to the `acli update` command should be manually tested using the fol

1. Replace `@package_version@` on this line with `1.0.0` or any older version string: https://github.com/acquia/cli/blob/v1.0.0/bin/acli#L84
1. Build acli.phar as described above.
1. Now test: `./build/acli.phar self:update`
1. Now test: `./var/acli.phar self:update`

### Writing tests

Expand Down
13 changes: 0 additions & 13 deletions Dockerfile

This file was deleted.

Loading

0 comments on commit d145d7b

Please sign in to comment.