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: Yuuki-Discord/Yuuki-Bot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.5.2
Choose a base ref
...
head repository: Yuuki-Discord/Yuuki-Bot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 7 commits
  • 5 files changed
  • 2 contributors

Commits on Aug 2, 2024

  1. Bump rexml from 3.3.2 to 3.3.3 (#115)

    Bumps [rexml](https://github.com/ruby/rexml) from 3.3.2 to 3.3.3.
    - [Release notes](https://github.com/ruby/rexml/releases)
    - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
    - [Commits](ruby/rexml@v3.3.2...v3.3.3)
    
    ---
    updated-dependencies:
    - dependency-name: rexml
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Aug 2, 2024
    Copy the full SHA
    40d8359 View commit details

Commits on Aug 4, 2024

  1. Upgrade Actions

    Erisa authored and spotlightishere committed Aug 4, 2024
    Copy the full SHA
    37c19db View commit details

Commits on Aug 22, 2024

  1. Bump rexml from 3.3.3 to 3.3.6 (#117)

    Bumps [rexml](https://github.com/ruby/rexml) from 3.3.3 to 3.3.6.
    - [Release notes](https://github.com/ruby/rexml/releases)
    - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
    - [Commits](ruby/rexml@v3.3.3...v3.3.6)
    
    ---
    updated-dependencies:
    - dependency-name: rexml
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Aug 22, 2024
    Copy the full SHA
    f12b336 View commit details

Commits on Oct 1, 2024

  1. actions: Use Ubicloud instead of self-hosted (#118)

    * actions: Use Ubicloud instead of self-hosted
    
    Makes use of managed Ubicloud runners for multi-platform builds rather than relying on self-hosted actions runners
    x86 and arm builds are built concurrently on sepatate runners and marged at the end.
    
    https://www.ubicloud.com/docs/github-actions-integration/quickstart
    Erisa authored Oct 1, 2024
    Copy the full SHA
    e58a5fd View commit details
  2. actions: typo fix

    Erisa committed Oct 1, 2024
    Copy the full SHA
    685f877 View commit details
  3. actions: login to ghcr correctly in merge

    Erisa committed Oct 1, 2024
    Copy the full SHA
    59dd350 View commit details

Commits on Oct 29, 2024

  1. Bump rexml from 3.3.6 to 3.3.9 (#119)

    Bumps [rexml](https://github.com/ruby/rexml) from 3.3.6 to 3.3.9.
    - [Release notes](https://github.com/ruby/rexml/releases)
    - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
    - [Commits](ruby/rexml@v3.3.6...v3.3.9)
    
    ---
    updated-dependencies:
    - dependency-name: rexml
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 29, 2024
    Copy the full SHA
    5143b05 View commit details
Showing with 133 additions and 83 deletions.
  1. +0 −43 .github/workflows/docker-push.yml
  2. +0 −35 .github/workflows/docker-test.yml
  3. +130 −0 .github/workflows/docker.yml
  4. +2 −2 .github/workflows/rubocop.yml
  5. +1 −3 Gemfile.lock
43 changes: 0 additions & 43 deletions .github/workflows/docker-push.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/docker-test.yml

This file was deleted.

130 changes: 130 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
name: Build

on:
workflow_dispatch:
push:
branches:
- '*'
pull_request:
branches:
- '**' # matches every branch

env:
IMAGE_NAME: ghcr.io/yuuki-discord/yuuki-bot
jobs:
docker:
name: Docker ${{ matrix.platform }}
runs-on: ${{ matrix.runner }}
strategy:
fail-fast: false
matrix:
include:
- runner: ubicloud-standard-2
platform: linux/amd64
- runner: ubicloud-standard-2-arm
platform: linux/arm64,linux/arm/v6,linux/arm/v7

steps:
- name: Check out code
uses: actions/checkout@v4

- name: Set default branch variable
run : |
if [[ $GITHUB_REF_NAME == 'main' ]]; then
echo "IS_MAIN_BRANCH=true" >> "$GITHUB_ENV"
else
echo "IS_MAIN_BRANCH=false" >> "$GITHUB_ENV"
fi
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

-
name: Login to GitHub Container Registry
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v3
with:
registry: ghcr.io
username: yuuki-discord
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.IMAGE_NAME }}
tags: |
type=sha,prefix=
type=ref,event=branch
type=raw,value=latest,enable={{is_default_branch}}
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- name: Build and push by digest
id: build
uses: docker/build-push-action@v5
with:
context: .
platforms: ${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=ubicloud-${{ matrix.runner }}
cache-to: type=gha,mode=max,scope=ubicloud-${{ matrix.runner }}
outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=${{env.IS_MAIN_BRANCH}},name-canonical=${{env.IS_MAIN_BRANCH}},push=${{env.IS_MAIN_BRANCH}}
provenance: false

- name: Export digest
if: github.ref == 'refs/heads/main'
run: |
mkdir -p /tmp/digests
digest="${{ steps.build.outputs.digest }}"
touch "/tmp/digests/${digest#sha256:}"
- name: Upload digest
if: github.ref == 'refs/heads/main'
uses: actions/upload-artifact@v4
with:
name: digests-${{ matrix.runner }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1

merge:
if: github.ref == 'refs/heads/main'
runs-on: ubicloud
needs:
- docker
steps:
- name: Download digests
uses: actions/download-artifact@v4
with:
pattern: digests-*
merge-multiple: true
path: /tmp/digests
-
name: Login to GitHub Container Registry
if: github.ref == 'refs/heads/main'
uses: docker/login-action@v3
with:
registry: ghcr.io
username: yuuki-discord
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.IMAGE_NAME }}
tags: |
type=sha,prefix=
type=ref,event=branch
type=raw,value=latest,enable={{is_default_branch}}
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- name: Create manifest list and push
working-directory: /tmp/digests
run: |
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
$(printf '${{ env.IMAGE_NAME }}@sha256:%s ' *)
- name: Inspect image
run: |
docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
4 changes: 2 additions & 2 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby 3.1.2
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.2
- name: Cache gems
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: vendor/bundle
key: ${{ runner.os }}-rubocop-${{ hashFiles('**/Gemfile.lock') }}
4 changes: 1 addition & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -69,8 +69,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.2)
strscan
rexml (3.3.9)
rqrcode (2.2.0)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
@@ -94,7 +93,6 @@ GEM
rake (>= 0.8.1)
ruby-progressbar (1.13.0)
rumoji (0.5.0)
strscan (3.1.0)
unicode-display_width (2.5.0)
websocket (1.2.10)
websocket-client-simple (0.8.0)