From efe0d64f060e812fd9846073a13837a3f2a27862 Mon Sep 17 00:00:00 2001 From: Jef LeCompte Date: Thu, 12 Nov 2020 08:37:01 -0500 Subject: [PATCH] revert: pipeline changes Ref: 15e45202131ac04864932970ec8a811cb560e5f9 Signed-off-by: Jef LeCompte --- .github/workflows/cd.yaml | 22 ++-------------------- .github/workflows/ci.yaml | 6 ++---- .github/workflows/nightly.yaml | 18 ++++++++++++++++++ README.md | 12 ++++++------ 4 files changed, 28 insertions(+), 30 deletions(-) create mode 100644 .github/workflows/nightly.yaml diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index b51c37a..206b806 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -3,26 +3,8 @@ on: push: branches: - main - - develop - paths-ignore: - - '**.md' jobs: - publish-nightly: - if: contains(github.ref, 'develop') - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: login into github package registry - run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin - - name: build nightly docker image - run: | - docker build \ - -t "ghcr.io/${GITHUB_REPOSITORY}:${GITHUB_SHA:0:7}" \ - -t "ghcr.io/${GITHUB_REPOSITORY}:nightly" . - - name: publish nightly - run: docker push "ghcr.io/${GITHUB_REPOSITORY}" - publish-latest: - if: contains(github.ref, 'main') + publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -42,6 +24,6 @@ jobs: -t "ghcr.io/${GITHUB_REPOSITORY}:latest" . env: TAG_NAME: ${{ steps.release.outputs.tag_name }} - - name: publish latest + - name: publish latest image if: ${{ steps.release.outputs.release_created }} run: docker push "ghcr.io/${GITHUB_REPOSITORY}" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1548f0e..c65b5b7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,11 +2,9 @@ name: ci on: pull_request: branches: - - develop - paths-ignore: - - '**.md' + - main jobs: - build-lint: + build-and-lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml new file mode 100644 index 0000000..2a96372 --- /dev/null +++ b/.github/workflows/nightly.yaml @@ -0,0 +1,18 @@ +name: nightly +on: + schedule: + - cron: '0 0 * * *' +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: login into github package registry + run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin + - name: build nightly docker image + run: | + docker build \ + -t "ghcr.io/${GITHUB_REPOSITORY}:${GITHUB_SHA:0:7}" \ + -t "ghcr.io/${GITHUB_REPOSITORY}:nightly" . + - name: publish nightly image + run: docker push "ghcr.io/${GITHUB_REPOSITORY}" diff --git a/README.md b/README.md index 639b6cc..c6a10ce 100644 --- a/README.md +++ b/README.md @@ -28,15 +28,15 @@ getting `streetmerchant` running! ### Installation: native -| Branch | Note | +| Reference | Note | |:---:|---| -| `main` | Latest release; usually tagged, stable | -| `develop` | Latest HEAD; not tagged, could be unstable | +| tag | Example, `v1.0.0`; stable | +| `main` | Latest HEAD; not tagged, could be unstable | - [Node.js 14](https://nodejs.org/en/) - [git](https://git-scm.com/) - Clone this project `git clone https://github.com/jef/streetmerchant.git` - - To checkout a particular branch, use `git checkout ` after cloning + - To checkout a particular ref, use `git checkout ` after cloning - Run `npm install` - Copy `.env-example` to a new file `.env` and edit the `.env` file to your liking using your [favorite text editor](https://code.visualstudio.com/) @@ -53,8 +53,8 @@ Available via GitHub Container Registry. | Tag | Note | |:---:|---| -| `latest` | Latest release; usually tagged, stable | -| `nightly` | Latest HEAD; not tagged, could be unstable | +| `latest` | Latest release; stable | +| `nightly` | Latest HEAD each day at midnight UTC; could be unstable | ```sh # to run