Skip to content
This repository has been archived by the owner on Sep 11, 2022. It is now read-only.

Commit

Permalink
feat: rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
favna committed Jul 26, 2020
1 parent 53e20f2 commit a3f710d
Show file tree
Hide file tree
Showing 6 changed files with 460 additions and 460 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ To contribute to this repository, feel free to create a new fork of the reposito
submit a pull request. We highly suggest [ESLint] to be installed
in your text editor or IDE of your choice to ensure builds from GitHub Actions do not fail.

1. Fork, clone, and select the **master** branch.
1. Fork, clone, and select the **main** branch.
2. Create a new branch in your fork.
3. Make your changes.
4. Ensure your linting and tests pass by running `yarn test && yarn lint`
Expand All @@ -15,6 +15,6 @@ in your text editor or IDE of your choice to ensure builds from GitHub Actions d

<!-- Link Dump -->

[Discord Server]: https://join.skyra.pw
[discord server]: https://join.skyra.pw
[here]: https://github.com/skyra-project/skyra/pulls
[ESLint]: https://eslint.org/
[eslint]: https://eslint.org/
4 changes: 2 additions & 2 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
- name: 'Bug: Fixed'
description: Issues that report bugs and have been fixed.
color: 00fa9a
- name: 'Bug: Fixed in master'
description: Issues that report bugs from stable, but that are fixed in master.
- name: 'Bug: Fixed in main'
description: Issues that report bugs from stable, but that are fixed in main.
color: b3e88c
- name: 'Bug: Pending Response'
description: Issues that report bugs and are pending of a response from the author.
Expand Down
150 changes: 75 additions & 75 deletions .github/workflows/branch-imager.yml
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
name: Branch Imager

on:
push:
branches-ignore:
- master
push:
branches-ignore:
- main

jobs:
Build:
name: Compiling TypeScript
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- name: Checkout Project
uses: actions/checkout@v2
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: 14
- name: Restore CI Cache
uses: actions/cache@v1
with:
path: node_modules
key: ${{ runner.os }}-14-${{ hashFiles('**/yarn.lock') }}
- name: Install NodeJS Dependencies
run: yarn
- name: Compile TypeScript
uses: icrawl/action-tsc@v1
with:
build: src
- name: Upload API bundle to artifacts
uses: actions/upload-artifact@v2-preview
with:
name: api_bundle
path: generated/api/
Build:
name: Compiling TypeScript
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[skip ci]')"
steps:
- name: Checkout Project
uses: actions/checkout@v2
- name: Use Node.js 14
uses: actions/setup-node@v1
with:
node-version: 14
- name: Restore CI Cache
uses: actions/cache@v1
with:
path: node_modules
key: ${{ runner.os }}-14-${{ hashFiles('**/yarn.lock') }}
- name: Install NodeJS Dependencies
run: yarn
- name: Compile TypeScript
uses: icrawl/action-tsc@v1
with:
build: src
- name: Upload API bundle to artifacts
uses: actions/upload-artifact@v2-preview
with:
name: api_bundle
path: generated/api/

Dockerhub:
name: Publish image to Dockerhub
runs-on: ubuntu-latest
if: "!(contains(github.event.head_commit.message, '[skip ci]') ||contains(github.event.head_commit.message, '[skip docker]'))"
needs: Build
steps:
- name: Checkout Project
uses: actions/checkout@v2
- name: Download build bundle artifact
uses: actions/download-artifact@v2-preview
with:
name: api_bundle
path: generated/api/
- name: Get GitHub Branch Name
run: echo ::set-env name=GITHUB_BRANCH_NAME::$(echo ${{ github.ref }} | cut -c12- | sed -e 's/\/\|_/-/g')
- name: Publish to Dockerhub
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: skyrabot/saelem
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
tags: "${{ env.GITHUB_BRANCH_NAME }}"
Dockerhub:
name: Publish image to Dockerhub
runs-on: ubuntu-latest
if: "!(contains(github.event.head_commit.message, '[skip ci]') ||contains(github.event.head_commit.message, '[skip docker]'))"
needs: Build
steps:
- name: Checkout Project
uses: actions/checkout@v2
- name: Download build bundle artifact
uses: actions/download-artifact@v2-preview
with:
name: api_bundle
path: generated/api/
- name: Get GitHub Branch Name
run: echo ::set-env name=GITHUB_BRANCH_NAME::$(echo ${{ github.ref }} | cut -c12- | sed -e 's/\/\|_/-/g')
- name: Publish to Dockerhub
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: skyrabot/saelem
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
tags: '${{ env.GITHUB_BRANCH_NAME }}'

Github-Package-Registry-Docker:
name: Publish image to Github Package Registry
runs-on: ubuntu-latest
if: "!(contains(github.event.head_commit.message, '[skip ci]') ||contains(github.event.head_commit.message, '[skip docker]'))"
needs: Build
steps:
- name: Checkout Project
uses: actions/checkout@v2
- name: Download build bundle artifact
uses: actions/download-artifact@v2-preview
with:
name: api_bundle
path: generated/api/
- name: Get GitHub Branch Name
run: echo ::set-env name=GITHUB_BRANCH_NAME::$(echo ${{ github.ref }} | cut -c12- | sed -e 's/\/\|_/-/g')
- name: Publish to Github Package Registry
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: skyra-project/saelem/saelem
username: NM-EEA-Y
password: ${{ secrets.SKYRA_TOKEN }}
tags: "${{ env.GITHUB_BRANCH_NAME }}"
registry: docker.pkg.github.com
Github-Package-Registry-Docker:
name: Publish image to Github Package Registry
runs-on: ubuntu-latest
if: "!(contains(github.event.head_commit.message, '[skip ci]') ||contains(github.event.head_commit.message, '[skip docker]'))"
needs: Build
steps:
- name: Checkout Project
uses: actions/checkout@v2
- name: Download build bundle artifact
uses: actions/download-artifact@v2-preview
with:
name: api_bundle
path: generated/api/
- name: Get GitHub Branch Name
run: echo ::set-env name=GITHUB_BRANCH_NAME::$(echo ${{ github.ref }} | cut -c12- | sed -e 's/\/\|_/-/g')
- name: Publish to Github Package Registry
uses: elgohr/Publish-Docker-Github-Action@master
with:
name: skyra-project/saelem/saelem
username: NM-EEA-Y
password: ${{ secrets.SKYRA_TOKEN }}
tags: '${{ env.GITHUB_BRANCH_NAME }}'
registry: docker.pkg.github.com

0 comments on commit a3f710d

Please sign in to comment.