Skip to content

Commit

Permalink
Revert "Merge remote-tracking branch 'origin/release/13.4' into dev"
Browse files Browse the repository at this point in the history
This reverts commit 40b2bbe, reversing
changes made to b4c6cb1.
  • Loading branch information
ulferts committed Mar 21, 2024
1 parent 40b2bbe commit 3b2121f
Show file tree
Hide file tree
Showing 5,220 changed files with 72,636 additions and 69,801 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
21a696ef9b170e14ad2daf53364a4c2113822c2f
# Update copyright information for 2023
c795874f7f281297bbd3bad2fdb58b24cb4ce624
# switch to double quotes
5c72ea0046a6b5230bf456f55a296ed6fd579535
9e4934cd0a468f46d8f0fc0f11ebc2d4216f789c
31 changes: 21 additions & 10 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
inputs:
tag:
description: "The tag to release. Note that this happens by default on the tag push. Only run this action when something went wrong!"
required: true
required: false

permissions:
contents: read # to fetch code (actions/checkout)
Expand All @@ -23,7 +23,7 @@ env:
jobs:
build:
if: github.repository == 'opf/openproject'
runs-on: [ self-hosted, aws, ubuntu22, x64, 2XL ]
runs-on: runs-on,runner=8cpu-linux,family=m7i+m7a,run-id=${{ github.run_id }}
strategy:
matrix:
include:
Expand All @@ -45,21 +45,31 @@ jobs:
run: |
if [[ ${{ github.event_name }} == 'push' ]]; then
TAG_REF=${GITHUB_REF#refs/tags/}
CHECKOUT_REF=$GITHUB_REF
elif [[ ${{ github.event_name }} == 'schedule' ]]; then
TAG_REF=dev
CHECKOUT_REF=refs/heads/dev
elif [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
TAG_REF=${{ inputs.tag }}
CHECKOUT_REF=${{ inputs.tag }}
else
echo "Unsupported event"
exit 1
fi
if [ -z "$TAG_REF" ] || [ -z "$CHECKOUT_REF" ]; then
echo "No TAG_REF or CHECKOUT_REF set. Aborting"
exit 1
fi
VERSION=${TAG_REF#v}
echo "Version: $VERSION"
echo "::set-output name=version::$VERSION"
- name: Checkout current release
if: ${{ github.event_name == 'push' }}
uses: actions/checkout@v3
- name: Checkout specific version
if: ${{ github.event_name != 'push' }}
echo "::set-output name=checkout_ref::$CHECKOUT_REF"
- name: Checkout
with:
ref: ${{ inputs.tag }}
uses: actions/checkout@v3
ref: ${{ steps.extract_version.outputs.checkout_ref }}
uses: actions/checkout@v4
- name: Prepare docker files
run: |
cp ./docker/prod/Dockerfile ./Dockerfile
Expand All @@ -82,6 +92,7 @@ jobs:
images: |
${{ env.REGISTRY_IMAGE }}
- name: Build image
id: build
uses: docker/build-push-action@v4
with:
context: .
Expand All @@ -104,7 +115,7 @@ jobs:
-e SUPERVISORD_LOG_LEVEL=debug \
-e OPENPROJECT_LOGIN__REQUIRED=false \
-e OPENPROJECT_HTTPS=false \
${{ fromJSON(steps.meta.outputs.json).tags[0] }}
${{ steps.build.outputs.imageid }}
sleep 60
Expand Down
5 changes: 2 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,9 @@ Style/SpecialGlobalVars:
# For the record: using single quotes does NOT have any performance advantages.
# Even if it did, this would be a silly argument.
#
# Ideally we would just use double quotes everywhere but since that would result
# in innumerable rubocop offenses we will just disable this. Quote away.
# Quote away.
Style/StringLiterals:
Enabled: false
EnforcedStyle: double_quotes

Style/TrivialAccessors:
Enabled: false
Expand Down
Loading

0 comments on commit 3b2121f

Please sign in to comment.