Skip to content
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
4 changes: 2 additions & 2 deletions .github/scripts/notify-nc-and-apps-releases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ is_latest_release_tag() {
mapfile -t tags <<< "$nextcloud_latest_release_tag" # Convert newlines into array elements

for tag in "${tags[@]}"; do
message+="<a href='https://github.com/$REPO_OWNER/$REPO_NAME/releases/tag/$tag'>$tag</a>, "
message+="<a href=\"https://github.com/$REPO_OWNER/$REPO_NAME/releases/tag/$tag\">$tag</a>, "
done

message=${message%, } # Remove trailing comma and space
else
message='<b>🔔 Alert! New release of \"'$APP_NAME'\":<b> <a href='https://github.com/$REPO_OWNER/$REPO_NAME/releases/tag/$nextcloud_latest_release_tag'>'$nextcloud_latest_release_tag'</a>'
message='<b>🔔 Alert! New release of \"'$APP_NAME'\":<b> <a href=\"https://github.com/$REPO_OWNER/$REPO_NAME/releases/tag/$nextcloud_latest_release_tag\">'$nextcloud_latest_release_tag'</a>'
fi

log_info "Found new release tag(s): $nextcloud_latest_release_tag"
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/notify-to-element.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ send_message_to_room_response=$(curl -s -XPOST "$ELEMENT_CHAT_URL/_matrix/client
"msgtype": "m.text",
"body": "",
"format": "org.matrix.custom.html",
"formatted_body": "<a href='https://github.com/$REPO_OWNER/$REPO_NAME/actions/runs/$RUN_ID'>NC-Nightly-'$BRANCH_NAME'</a><br></br><b><i>Status: '$workflow_status'</i></b>"
"formatted_body": "<a href=\"https://github.com/$REPO_OWNER/$REPO_NAME/actions/runs/$RUN_ID\">NC-Nightly-'$BRANCH_NAME'</a><br></br><b><i>Status: '$workflow_status'</i></b>"
}
'
)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notify-app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v6

- name: Check and notify releases
env:
Expand Down
19 changes: 13 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,20 @@ jobs:
APP_ID: integration_openproject
runs-on: ubuntu-latest
steps:
- name: Use Node 18
uses: actions/setup-node@v3
- name: Read node and npm versions from package.json
uses: skjnldsv/read-package-engines-version-actions@v3
id: versions
with:
node-version: 18
fallbackNode: '^20'
fallbackNpm: '^10'

- name: Set up npm
run: npm i -g npm
- name: Setup NodeJS ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@v6
with:
node-version: ${{ steps.versions.outputs.nodeVersion }}

- name: Setup NPM ${{ steps.versions.outputs.npmVersion }}
run: npm i -g npm@"${{ steps.versions.outputs.npmVersion }}"

- name: Setup PHP
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d
Expand All @@ -33,7 +40,7 @@ jobs:
tools: php-cs-fixer, phpunit

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

- name: Get current tag
id: tag
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
uses: actions/checkout@v6
with:
persist-credentials: false

Expand Down
54 changes: 19 additions & 35 deletions .github/workflows/shared_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
branch:
required: true
type: string
default: master
nextcloud_versions:
required: false
type: string
Expand All @@ -23,25 +24,20 @@ jobs:
name: js lint and unit tests
runs-on: ubuntu-22.04
steps:
- name: Checkout for nightly CI
if: github.event_name == 'schedule'
uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v6
with:
ref: ${{ inputs.branch }}

- name: Checkout
if: github.event_name != 'schedule'
uses: actions/checkout@v3

- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@v2
uses: skjnldsv/read-package-engines-version-actions@v3
id: versions
with:
fallbackNode: '^14'
fallbackNpm: '^7'
fallbackNode: '^20'
fallbackNpm: '^10'

- name: Setup NodeJS ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@v3
uses: actions/setup-node@v6
with:
node-version: ${{ steps.versions.outputs.nodeVersion }}
cache: 'npm'
Expand Down Expand Up @@ -78,16 +74,11 @@ jobs:
create-matrix:
runs-on: ubuntu-22.04
steps:
- name: Checkout for nightly CI
if: github.event_name == 'schedule'
uses: actions/checkout@v3
- name: Checkout
uses: actions/checkout@v6
with:
ref: ${{ inputs.branch }}

- name: Checkout
if: github.event_name != 'schedule'
uses: actions/checkout@v3

- name: Create matrix
id: create-matrix
env:
Expand Down Expand Up @@ -151,51 +142,44 @@ jobs:
options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- name: Checkout for nightly CI
if: github.event_name == 'schedule'
uses: actions/checkout@v3
with:
path: integration_openproject
ref: ${{ inputs.branch }}

- name: Checkout
if: github.event_name != 'schedule'
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
path: integration_openproject
ref: ${{ inputs.branch }}

- name: Checkout activity app
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
repository: nextcloud/activity
path: activity
ref: ${{ matrix.nextcloudVersion }}

- name: Checkout groupfolders app
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
repository: nextcloud/groupfolders
path: groupfolders
ref: ${{ matrix.nextcloudVersion }}

- name: Checkout user_oidc app
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
repository: nextcloud/user_oidc
ref: v7.2.0
fetch-tags: true
path: user_oidc

- name: Checkout oidc app
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
repository: h2CK/oidc
ref: 1.14.1
fetch-tags: true
path: oidc

- name: Checkout server (for phpunit and psalm)
uses: actions/checkout@v3
uses: actions/checkout@v6
with:
submodules: true
repository: nextcloud/server
Expand All @@ -215,7 +199,7 @@ jobs:
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache PHP dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('./composer.lock') }}
Expand Down Expand Up @@ -255,7 +239,7 @@ jobs:
- name: Setup .NET Core # this is required to execute Convert PHP cobertura coverage to lcov step
if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable32' && matrix.phpVersion == '8.2' }}
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v5
with:
dotnet-version: 6.0.101
dotnet-quality: 'ga'
Expand Down Expand Up @@ -324,7 +308,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: checkout
uses: actions/checkout@v2
uses: actions/checkout@v6

- name: Notify nightly report to element
env:
Expand Down
1 change: 0 additions & 1 deletion dev/keycloak/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN wget -qO /bin/curl https://github.com/moparisthebest/static-curl/releases/la
FROM ${IMAGE_REPO}:${IMAGE_TAG}

COPY --from=commands --chmod=755 /bin/curl /usr/bin/curl
COPY --from=commands --chmod=755 /bin/which /usr/bin/which
COPY --chmod=755 keycloak.sh /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]
6 changes: 1 addition & 5 deletions dev/keycloak/keycloak.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@

set -eo pipefail

CURL=$(which curl)
if [ -z "$CURL" ]; then
echo "[ERROR] curl: command not found"
exit 1
fi
CURL=/usr/bin/curl

KC_URL="http://localhost:8080"

Expand Down
Loading