From 4c425a7c30233522ca5ced68057ce28d7fb6312c Mon Sep 17 00:00:00 2001 From: Vijay A Date: Tue, 18 Oct 2022 08:18:16 +0530 Subject: Remove duplicated lines for nightly and release branch builds [skip ci] --- .github/workflows/builds.yml | 76 ++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 52 deletions(-) (limited to '.github/workflows/builds.yml') diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index f6df0f86a..da3fe69d5 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -190,19 +190,8 @@ jobs: CSC_IDENTITY_AUTO_DISCOVERY: false run: npm run build -- --publish never shell: bash - - name: Build Ferdium with publish for 'nightly' branch - if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} - env: - GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} - CSC_IDENTITY_AUTO_DISCOVERY: true - APPLEID: ${{ secrets.APPLEID }} - APPLEID_PASSWORD: ${{ secrets.APPLEID_PASSWORD }} - CSC_LINK: ${{ secrets.CSC_LINK }} - CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} - run: npm run build -- --publish always - shell: bash - - name: Build Ferdium with publish for 'release' branch - if: ${{ env.GIT_BRANCH_NAME == 'release' }} + - name: "Build Ferdium with publish for '${{ env.GIT_BRANCH_NAME }}' branch" + if: ${{ env.GIT_BRANCH_NAME == 'nightly' || env.GIT_BRANCH_NAME == 'release' }} env: GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} CSC_IDENTITY_AUTO_DISCOVERY: true @@ -267,7 +256,23 @@ jobs: - name: Install node dependencies run: npm i - name: Figure out used package.json version - run: echo "PACKAGE_VERSION=$(node -p 'require("./package.json").version')" >> $GITHUB_ENV + run: | + PACKAGE_VERSION="$(node -p 'require("./package.json").version')" + echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV + if [[ "$GIT_BRANCH_NAME" == "nightly" ]]; then + echo "SNAP_PUBLISH_REPO=nightlies" >> $GITHUB_ENV + echo "SNAP_PUBLISH_CHANNEL=edge" >> $GITHUB_ENV + elif [[ "$GIT_BRANCH_NAME" == "release" ]]; then + echo "SNAP_PUBLISH_REPO=ferdium" >> $GITHUB_ENV + if [[ "$PACKAGE_VERSION" =~ "beta" ]]; then + echo "SNAP_PUBLISH_CHANNEL=beta" >> $GITHUB_ENV + else + echo "SNAP_PUBLISH_CHANNEL=stable" >> $GITHUB_ENV + fi + else + echo "SNAP_PUBLISH_REPO=none" >> $GITHUB_ENV + echo "SNAP_PUBLISH_CHANNEL=none" >> $GITHUB_ENV + fi shell: bash - name: Package recipes run: pnpm i && pnpm lint && pnpm reformat-files && pnpm package @@ -280,32 +285,8 @@ jobs: CSC_IDENTITY_AUTO_DISCOVERY: false run: npm run build -- --publish never shell: bash - - name: Build Ferdium with publish for 'nightly' branch - if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} - env: - GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} - CSC_IDENTITY_AUTO_DISCOVERY: false - SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }} - run: | - sudo snap install snapcraft --channel=5.x/stable --classic - echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - - npm run build -- --publish always -c.snap.publish.repo=nightlies -c.snap.publish.channels=edge - snapcraft logout - shell: bash - - name: Build Ferdium with publish for 'release' beta branch - if: ${{ env.GIT_BRANCH_NAME == 'release' && contains(env.PACKAGE_VERSION, 'beta') }} - env: - GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} - CSC_IDENTITY_AUTO_DISCOVERY: false - SNAPCRAFT_LOGIN: ${{ secrets.SNAPCRAFT_LOGIN }} - run: | - sudo snap install snapcraft --channel=5.x/stable --classic - echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - - npm run build -- --publish always -c.snap.publish.repo=ferdium -c.snap.publish.channels=beta - snapcraft logout - shell: bash - - name: Build Ferdium with publish for 'release' stable branch - if: ${{ env.GIT_BRANCH_NAME == 'release' && !contains(env.PACKAGE_VERSION, 'beta') }} + - name: "Build Ferdium with publish for '${{ env.GIT_BRANCH_NAME }}' branch" + if: ${{ env.GIT_BRANCH_NAME == 'nightly' || env.GIT_BRANCH_NAME == 'release' }} env: GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} CSC_IDENTITY_AUTO_DISCOVERY: false @@ -313,7 +294,7 @@ jobs: run: | sudo snap install snapcraft --channel=5.x/stable --classic echo "$SNAPCRAFT_LOGIN" | snapcraft login --with - - npm run build -- --publish always -c.snap.publish.repo=ferdium -c.snap.publish.channels=stable + npm run build -- --publish always -c.snap.publish.repo=$SNAP_PUBLISH_REPO -c.snap.publish.channels=$SNAP_PUBLISH_CHANNEL snapcraft logout shell: bash @@ -390,17 +371,8 @@ jobs: CSC_IDENTITY_AUTO_DISCOVERY: false run: npm run build -- --publish never shell: bash - - name: Build Ferdium with publish for 'nightly' branch - if: ${{ env.GIT_BRANCH_NAME == 'nightly' }} - env: - GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} - CSC_IDENTITY_AUTO_DISCOVERY: true - WIN_CSC_LINK: ${{ secrets.WIN_CSC_LINK }} - WIN_CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }} - run: npm run build -- --publish always - shell: bash - - name: Build Ferdium with publish for 'release' branch - if: ${{ env.GIT_BRANCH_NAME == 'release' }} + - name: "Build Ferdium with publish for '${{ env.GIT_BRANCH_NAME }}' branch" + if: ${{ env.GIT_BRANCH_NAME == 'nightly' || env.GIT_BRANCH_NAME == 'release' }} env: GH_TOKEN: ${{ secrets.FERDIUM_PUBLISH_TOKEN }} CSC_IDENTITY_AUTO_DISCOVERY: true -- cgit v1.2.3-54-g00ecf