diff --git a/.github/workflows/autotools-tier1.yml b/.github/workflows/autotools-tier1.yml index bd7b234..e635ea9 100644 --- a/.github/workflows/autotools-tier1.yml +++ b/.github/workflows/autotools-tier1.yml @@ -1,11 +1,11 @@ -name: Build - GTK3 Branch (Tier 1 platforms) +name: Build - 1.1 Branch (Tier 1 platforms) on: # Triggers the workflow on push or pull request events but only for the branch push: - branches: [ gsmartcontrol-gtk3 ] + branches: [ release/1.1 ] pull_request: - branches: [ gsmartcontrol-gtk3 ] + branches: [ release/1.1 ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: gsmartcontrol-gtk3 + ref: release/1.1 - name: Install Dependencies run: sudo apt-get install libpcre3-dev libgtkmm-3.0-dev gettext autoconf automake @@ -61,7 +61,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v2 with: - name: Source Packages (GTK3 Branch) + name: Source Packages (1.1 Branch) path: ${{runner.workspace}}/build/gsmartcontrol-*.tar.bz2 @@ -80,7 +80,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: gsmartcontrol-gtk3 + ref: release/1.1 - uses: msys2/setup-msys2@v2 # p7zip is needed to extract smartmontools @@ -166,6 +166,6 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v2 with: - name: Windows Packages (GTK3 Branch) + name: Windows Packages (1.1 Branch) path: ${{runner.workspace}}/build/gsmartcontrol-*-win*.* diff --git a/.github/workflows/autotools-tier2.yml b/.github/workflows/autotools-tier2.yml index abc4bf6..5cd34ff 100644 --- a/.github/workflows/autotools-tier2.yml +++ b/.github/workflows/autotools-tier2.yml @@ -1,11 +1,11 @@ -name: Build - GTK3 Branch (Tier 2 platforms) +name: Build - 1.1 Branch (Tier 2 platforms) on: # Triggers the workflow on push or pull request events but only for the branch push: - branches: [ gsmartcontrol-gtk3 ] + branches: [ release/1.1 ] pull_request: - branches: [ gsmartcontrol-gtk3 ] + branches: [ release/1.1 ] # Allows you to run this workflow manually from the Actions tab. # This does not work for non-default branches, that's why we use the push / pull_request triggers above. workflow_dispatch: @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: gsmartcontrol-gtk3 + ref: release/1.1 - name: Install Dependencies run: brew install pkg-config gtkmm3 pcre automake autoconf @@ -65,7 +65,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: gsmartcontrol-gtk3 + ref: release/1.1 - name: Build and test in FreeBSD id: test diff --git a/.gitignore b/.gitignore index 0809943..b7cd6cf 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,5 @@ Thumbs.db /po/gsmartcontrol.pot /po/*.gmo +# Backup files +*~