From 7436a58ea17edf8758c29dfa9876816354ec6b1a Mon Sep 17 00:00:00 2001 From: Neko7sora <75793267+Neko7sora@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:13:34 +0900 Subject: 改行コードをLFに統一 (#9926) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update gitattribute editorconfig * Normalize all the line endings --- .github/workflows/check_copyright_year.yml | 36 +++++----- .github/workflows/lint.yml | 108 ++++++++++++++--------------- 2 files changed, 72 insertions(+), 72 deletions(-) (limited to '.github') diff --git a/.github/workflows/check_copyright_year.yml b/.github/workflows/check_copyright_year.yml index 99799672f2..8daea44a83 100644 --- a/.github/workflows/check_copyright_year.yml +++ b/.github/workflows/check_copyright_year.yml @@ -1,18 +1,18 @@ -name: Check copyright year - -on: - push: - branches: - - master - - develop - -jobs: - check_copyright_year: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.2.0 - - run: | - if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then - echo "Please change copyright year!" - exit 1 - fi +name: Check copyright year + +on: + push: + branches: + - master + - develop + +jobs: + check_copyright_year: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3.2.0 + - run: | + if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then + echo "Please change copyright year!" + exit 1 + fi diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b88b97ab0c..6a579bffc8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,54 +1,54 @@ -name: Lint - -on: - push: - branches: - - master - - develop - pull_request: - -jobs: - pnpm_install: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.3.0 - with: - fetch-depth: 0 - submodules: true - - uses: pnpm/action-setup@v2 - with: - version: 7 - run_install: false - - uses: actions/setup-node@v3.6.0 - with: - node-version: 18.x - cache: 'pnpm' - - run: corepack enable - - run: pnpm i --frozen-lockfile - - lint: - needs: [pnpm_install] - runs-on: ubuntu-latest - continue-on-error: true - strategy: - matrix: - workspace: - - backend - - frontend - - sw - steps: - - uses: actions/checkout@v3.3.0 - with: - fetch-depth: 0 - submodules: true - - uses: pnpm/action-setup@v2 - with: - version: 7 - run_install: false - - uses: actions/setup-node@v3.6.0 - with: - node-version: 18.x - cache: 'pnpm' - - run: corepack enable - - run: pnpm i --frozen-lockfile - - run: pnpm --filter ${{ matrix.workspace }} run lint +name: Lint + +on: + push: + branches: + - master + - develop + pull_request: + +jobs: + pnpm_install: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3.3.0 + with: + fetch-depth: 0 + submodules: true + - uses: pnpm/action-setup@v2 + with: + version: 7 + run_install: false + - uses: actions/setup-node@v3.6.0 + with: + node-version: 18.x + cache: 'pnpm' + - run: corepack enable + - run: pnpm i --frozen-lockfile + + lint: + needs: [pnpm_install] + runs-on: ubuntu-latest + continue-on-error: true + strategy: + matrix: + workspace: + - backend + - frontend + - sw + steps: + - uses: actions/checkout@v3.3.0 + with: + fetch-depth: 0 + submodules: true + - uses: pnpm/action-setup@v2 + with: + version: 7 + run_install: false + - uses: actions/setup-node@v3.6.0 + with: + node-version: 18.x + cache: 'pnpm' + - run: corepack enable + - run: pnpm i --frozen-lockfile + - run: pnpm --filter ${{ matrix.workspace }} run lint -- cgit v1.2.3-freya From 192ea9738d84c9b65613f38cce024325b9b8c819 Mon Sep 17 00:00:00 2001 From: "Kohei Ota (inductor)" Date: Tue, 14 Feb 2023 14:38:53 +0900 Subject: attempt matrix build (#9927) --- .github/workflows/docker-develop.yml | 7 +++++-- .github/workflows/docker.yml | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to '.github') diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 09a2c33e0c..d0715f2e0a 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -11,6 +11,9 @@ jobs: name: Push Docker image to Docker Hub runs-on: ubuntu-latest if: github.repository == 'misskey-dev/misskey' + strategy: + matrix: + arch: [linux/amd64, linux/arm64] steps: - name: Check out the repo uses: actions/checkout@v3.3.0 @@ -18,7 +21,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v2.3.0 with: - platforms: linux/amd64,linux/arm64 + platforms: ${{ matrix.arch }} - name: Docker meta id: meta uses: docker/metadata-action@v4 @@ -35,7 +38,7 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: . push: true - platforms: ${{ steps.buildx.outputs.platforms }} + platforms: ${{ matrix.arch }} provenance: false tags: misskey/misskey:develop labels: develop diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a465d92eaf..e4440303d8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,7 +9,9 @@ jobs: push_to_registry: name: Push Docker image to Docker Hub runs-on: ubuntu-latest - + strategy: + matrix: + arch: [linux/amd64, linux/arm64] steps: - name: Check out the repo uses: actions/checkout@v3.3.0 @@ -17,7 +19,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v2.3.0 with: - platforms: linux/amd64,linux/arm64 + platforms: ${{ matrix.arch }} - name: Docker meta id: meta uses: docker/metadata-action@v4 @@ -41,7 +43,7 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: . push: true - platforms: ${{ steps.buildx.outputs.platforms }} + platforms: ${{ matrix.arch }} provenance: false tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} -- cgit v1.2.3-freya From c1f1e0ee7c20f7ff31bce940adba37303fdf3987 Mon Sep 17 00:00:00 2001 From: "Kohei Ota (inductor)" Date: Tue, 14 Feb 2023 15:00:50 +0900 Subject: Revert "attempt matrix build (#9927)" (#9930) This reverts commit 192ea9738d84c9b65613f38cce024325b9b8c819. --- .github/workflows/docker-develop.yml | 7 ++----- .github/workflows/docker.yml | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to '.github') diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index d0715f2e0a..09a2c33e0c 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -11,9 +11,6 @@ jobs: name: Push Docker image to Docker Hub runs-on: ubuntu-latest if: github.repository == 'misskey-dev/misskey' - strategy: - matrix: - arch: [linux/amd64, linux/arm64] steps: - name: Check out the repo uses: actions/checkout@v3.3.0 @@ -21,7 +18,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v2.3.0 with: - platforms: ${{ matrix.arch }} + platforms: linux/amd64,linux/arm64 - name: Docker meta id: meta uses: docker/metadata-action@v4 @@ -38,7 +35,7 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: . push: true - platforms: ${{ matrix.arch }} + platforms: ${{ steps.buildx.outputs.platforms }} provenance: false tags: misskey/misskey:develop labels: develop diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e4440303d8..a465d92eaf 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,9 +9,7 @@ jobs: push_to_registry: name: Push Docker image to Docker Hub runs-on: ubuntu-latest - strategy: - matrix: - arch: [linux/amd64, linux/arm64] + steps: - name: Check out the repo uses: actions/checkout@v3.3.0 @@ -19,7 +17,7 @@ jobs: id: buildx uses: docker/setup-buildx-action@v2.3.0 with: - platforms: ${{ matrix.arch }} + platforms: linux/amd64,linux/arm64 - name: Docker meta id: meta uses: docker/metadata-action@v4 @@ -43,7 +41,7 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: . push: true - platforms: ${{ matrix.arch }} + platforms: ${{ steps.buildx.outputs.platforms }} provenance: false tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} -- cgit v1.2.3-freya