Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OSC/ondemand
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.6.2
Choose a base ref
...
head repository: OSC/ondemand
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 1,332 changed files with 140,130 additions and 632 deletions.
35 changes: 35 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
component/activejobs:
- apps/activejobs/**/*

component/bc_desktop:
- apps/bc_desktop/**/*

component/dashboard:
- apps/dashboard/**/*

component/file_editor:
- apps/file-editor/**/*

component/file_browser:
- apps/files/**/*

component/jobcomposer:
- apps/myjobs/**/*

component/shell:
- apps/shell/**/*

component/nginx_stage:
- nginx_stage/**/*

component/mod_ood_proxy:
- mod_ood_proxy/**/*

component/ood_auth_map:
- ood_auth_map/**/*

component/ood_portal_generator:
- ood-portal-generator/**/*

area/build:
- lib/tasks/**/*
45 changes: 45 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Update Changelog

on:
workflow_dispatch:
schedule:
# every Monday morning
- cron: '0 2 * * 1'

defaults:
run:
shell: bash

jobs:
update-dependencies:
strategy:
fail-fast: false
runs-on: 'ubuntu-latest'
name: Update Changelog

steps:
- name: Checkout ${{ github.sha }}
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Update changelog
run: |
UPDATES=$(git log --after=$(date -d '7 days ago' +%Y-%m-%dT%00:00:00) --pretty=format:%s)
PRE_PROCESSED=$(printf '%s\n' "$UPDATES" | sed 's/\\/&&/g;s/^[[:blank:]]/\\&/;s/$/\\/')
sed -i "/^## \[Unreleased\]/a\\$PRE_PROCESSED" CHANGELOG.md
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.OSC_ROBOT_GH_PUB_REPO_TOKEN }}
commit-message: update changelog
committer: OSC ROBOT <osc.robot@gmail.com>
author: osc-bot <osc.robot@gmail.com>
delete-branch: true
title: 'Update Changelog'
push-to-fork: osc-bot/ondemand
branch: osc-bot/changelog-update
body: |
Changelog updates from the last 7 days
61 changes: 61 additions & 0 deletions .github/workflows/document-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Create issues for Merge Request

# Run this action when we merge into master
on:
pull_request:
branches:
- master
- 'feature/**'
- 'release_**'
types: [closed]

jobs:
# Create an issue on the documentation repository to document whatever was just pulled in.
create-doc-issue:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true
env:
PR_NUM: ${{ github.event.pull_request.number }}
TITLE: ${{ github.event.pull_request.title }}
steps:
- name: Create an issue on the documentation repository
if: contains(github.event.pull_request.labels.*.name, 'needs doc')
run: |
BODY="{
\"title\": \"$TITLE\",
\"body\": \"Create documentation for https://github.com/OSC/ondemand/pull/$PR_NUM\"
}"
curl --silent --output /dev/null --request POST \
--url https://api.github.com/repos/OSC/ood-documentation/issues \
--header 'Authorization: token ${{ secrets.OSC_ROBOT_GH_PUB_REPO_TOKEN }}' \
--header 'content-type: application/json' \
--data "$BODY"
- name: Create an issue on the puppet repository
if: contains(github.event.pull_request.labels.*.name, 'needs automation')
run: |
BODY="{
\"title\": \"$TITLE\",
\"body\": \"Create automation for https://github.com/OSC/ondemand/pull/$PR_NUM\"
}"
curl --silent --output /dev/null --request POST \
--url https://api.github.com/repos/OSC/puppet-module-openondemand/issues \
--header 'Authorization: token ${{ secrets.OSC_ROBOT_GH_PUB_REPO_TOKEN }}' \
--header 'content-type: application/json' \
--data "$BODY"
- name: Create an issue on the ansible repository
if: contains(github.event.pull_request.labels.*.name, 'needs automation')
run: |
BODY="{
\"title\": \"$TITLE\",
\"body\": \"Create automation for https://github.com/OSC/ondemand/pull/$PR_NUM\"
}"
curl --silent --output /dev/null --request POST \
--url https://api.github.com/repos/OSC/ood-ansible/issues \
--header 'Authorization: token ${{ secrets.OSC_ROBOT_GH_PUB_REPO_TOKEN }}' \
--header 'content-type: application/json' \
--data "$BODY"
25 changes: 25 additions & 0 deletions .github/workflows/issue-lifecycle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Issue Lifecycle

# Run this action when an issue is opened
on:
issues:
types: [opened]

jobs:
# If the created issue does not have a milestone attached to it, assign the issue to the "Needs Triaged" milestone
assign-milestone:
runs-on: ubuntu-latest
steps:
- name: Put in the backlog milestone if no milestone is defined.
if: github.event.issue.milestone == null
# Set environment
env:
MILESTONE_ID: 5
run: |
curl --silent --output /dev/null --request PATCH \
--url https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }} \
--header 'authorization: token ${{ secrets.OSC_ROBOT_GH_PUB_REPO_TOKEN }}' \
--header 'content-type: application/json' \
--data '{
"milestone": "'$MILESTONE_ID'"
}'
49 changes: 49 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Lint Random File

on:
workflow_dispatch:
schedule:
# every 3 days
- cron: '0 2 */3 * *'

defaults:
run:
shell: bash

jobs:
update-dependencies:
strategy:
fail-fast: false
runs-on: 'ubuntu-latest'
name: Lint Random File

steps:
- name: Checkout ${{ github.sha }}
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Ruby using Bundler
uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7.1"
bundler: "2.1.4"
bundler-cache: true

- name: Lint a file
run: bundle exec rake lint:random

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.OSC_ROBOT_GH_PUB_REPO_TOKEN }}
commit-message: lint a random file
committer: OSC ROBOT <osc.robot@gmail.com>
author: osc-bot <osc.robot@gmail.com>
delete-branch: true
title: 'Lint a random file'
push-to-fork: osc-bot/ondemand
branch: osc-bot/random-linted-file
body: |
The result of linting a random file.
18 changes: 18 additions & 0 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This action runs when a new PR is opened and will add labels to the PR
# if the files changed glob match any of the defined rules in .github/labeler.yml
name: Pull Request Labeler

on:
workflow_dispatch:
pull_request_target:

jobs:
triage:
name: Add labels to PR
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4.3.0
with:
repo-token: ${{ secrets.OSC_ROBOT_GH_PUB_REPO_TOKEN }}
configuration-path: .github/labeler.yml
sync-labels: true # Revert the labels applied to the PR when changes are reverted.
52 changes: 52 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Release

on:
push:
tags:
- '*'

jobs:
release:
runs-on: ubuntu-latest
name: Release OnDemand
steps:
- name: Set version
id: version
run: echo ::set-output name=version::${GITHUB_REF#refs/*/v}
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup Ruby using Bundler
uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7.1"
bundler: "2.1.4"
bundler-cache: true
- name: Generate tar.gz
run: bundle exec rake package:tar
env:
VERSION: ${{ steps.version.outputs.version }}
OOD_PACKAGING_DEBUG: 'true'
- name: Get release
id: get_release
uses: bruceadams/get-release@v1.2.3
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Upload Release files
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.get_release.outputs.upload_url }}
asset_path: packaging/rpm/ondemand-${{ steps.version.outputs.version }}.tar.gz
asset_name: ondemand-${{ steps.version.outputs.version }}.tar.gz
asset_content_type: application/gzip
- name: Upload to Zenodo
uses: rseng/zenodo-release@main
with:
token: ${{ secrets.OSC_ROBOT_ZENODO_TOKEN }}
version: ${{ steps.version.outputs.version }}
zenodo_json: .zenodo.json
archive: packaging/rpm/ondemand-${{ steps.version.outputs.version }}.tar.gz
doi: '10.5281/zenodo.6323791'
Loading